From c4073ff4ce1a342daad01a99d3fce84c54bc4776 Mon Sep 17 00:00:00 2001
From: Tony Mak <tonymak@google.com>
Date: Wed, 11 May 2016 18:44:00 +0100
Subject: [PATCH] Add badge icon for work contact in search result

BUG=26021888
BUG=28016344
(cherry picked from commit 6e00763823cd1b27ff88d25d0eb11f8addc3b2e6)

Change-Id: If0e2f7b1c58cd064ebfdae8a9b735b391c5009fc
---
 res/drawable-hdpi/ic_work_profile.png         | Bin 0 -> 158 bytes
 res/drawable-mdpi/ic_work_profile.png         | Bin 0 -> 160 bytes
 res/drawable-xhdpi/ic_work_profile.png        | Bin 0 -> 223 bytes
 res/drawable-xxhdpi/ic_work_profile.png       | Bin 0 -> 214 bytes
 res/drawable-xxxhdpi/ic_work_profile.png      | Bin 0 -> 343 bytes
 res/layout/contact_list_item_view.xml         |  33 +++++++++++++-----
 .../datamodel/data/ContactListItemData.java   |  16 ++++++++-
 .../ui/contact/ContactDropdownLayouter.java   |   4 ++-
 .../ui/contact/ContactListItemView.java       |  13 +++++--
 9 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_work_profile.png
 create mode 100644 res/drawable-mdpi/ic_work_profile.png
 create mode 100644 res/drawable-xhdpi/ic_work_profile.png
 create mode 100644 res/drawable-xxhdpi/ic_work_profile.png
 create mode 100644 res/drawable-xxxhdpi/ic_work_profile.png

diff --git a/res/drawable-hdpi/ic_work_profile.png b/res/drawable-hdpi/ic_work_profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c2e457818a53aa89c4646696d07ea2f434203b2
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iR8JSjkP60R38n>GmVL1o%28Ni
zBejHsv2hQ}9w`T}2|q2~Xq4*L@=Q6z-Kcfvp_IZY&TPj`Gb}73OcSc41chJBJ0`it
zps*)lDZ_%OzF-l?4?h|=u(2#z#+D=`fAC9};EHBZ28QKAUChVoLJWWwGI+ZBxvX<a
GXaWEQ!ZL;c

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_work_profile.png b/res/drawable-mdpi/ic_work_profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7ffd2b4ca18f47c02992dac779c7c8c82d02971
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6(mh=qLn;`P7pQ5h)%?rf%6mif
zk9+dLo#&S7H|#P{2)H7-C_!>Uv#egTMnrS)K`ABCDTi45rnfOXEVS4!^2|qifdNNU
zL#0^2Jl;F<9Lj-fU4k1LW^mOdhJN5)xPUj9Ghj)tRUik0-+@i#Up+EU0j*^4boFyt
I=akR{04Az6N&o-=

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_work_profile.png b/res/drawable-xhdpi/ic_work_profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..b47b485ecb209a2da63c4d186a155d474a2629de
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4U%RF5iLn;`P53ss9X8OLYH@V@^
z^(|<E7*`L2=5aMQZ)UGtZ~ZC%ShbY+{;{sw=6X#p<d>X=k5o;#R*S&_W(^0cFAfp{
zPSY3_Pq6h!CG>_K{CLSUph9N#9??S#&n`{Ak#pd=(*nM<Crge5M@8-u%8_P@I*_V+
zAtj6{^s_;L<b+qOx1<_4+uIo9J&Yc3FJsL1G)mB2#;D|=yiXwAI$$Y>({l|5hG~-z
Vv^-fnYa!6Z44$rjF6*2UngBJ8O}zjB

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_work_profile.png b/res/drawable-xxhdpi/ic_work_profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..de257e71372a1d4183c00a29207188bffacc94d7
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Dxt=bLAr*{ouWgrfG8ABbu$?__
zVvuOz%+DFGY?x*W&D8kh`S-8>z2}OPD_sqaF1x%m+2%-seB(xmS1KFs@k?4+3iUJ2
z&Swe;aLkd@2@L%5qpf$PuYh%Va?Tv4EleW%XKt@&5%OpVYcOBmCH>yw%cf#RUgf?1
z%rz1UPJRD-cicNTpJ^9ojl2W*0lR>|?Rx(|2IgP-=N4M~R_$!cw&x3kf3tq8*a&ne
NgQu&X%Q~loCIEV~QRM&t

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_work_profile.png b/res/drawable-xxxhdpi/ic_work_profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..72292bdb391400e3c00ca54b6eeb0d193c4f865d
GIT binary patch
literal 343
zcmV-d0jU0oP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ0003VNkl<ZcmeIw
zB~V0B6o>JP=1n;CxN-Z;O2jH2iOh#<Z(El>Sf7E46<m7RK3G8y-tOZ*hP@X%-@iWj
zJu#n4(=?4q#Iaf9FNP4ud=eN$-1A0YfCuCo3EU&kGmhQ~r3Xk5fC8vyoDHrJ54&Q6
zF{(^-G;xS{-T{r#fHfq*R*gM!NT6lyfVp6RSvz1c7+}#3SP2GL`Jn&>C_n)U$Oi-D
z?SLL6=C<jyY#WKWZaW}BG43n;(kCpEF!soB;~j8A#zaSwU9W&$lExLa<mmixDPxJ0
z<E$LDMsw%;Cse>60l23C1^i~fy;s1!8*u6saN-8cdj%BSfEF$gPdlf@xTD<@;hZ)T
pFIp&YQo`Tyo)Zf8r`I%1dj!EX-umIEf@lB$002ovPDHLkV1g<Zj^Y3S

literal 0
HcmV?d00001

diff --git a/res/layout/contact_list_item_view.xml b/res/layout/contact_list_item_view.xml
index 3015ae3..71a7370 100644
--- a/res/layout/contact_list_item_view.xml
+++ b/res/layout/contact_list_item_view.xml
@@ -63,15 +63,30 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical" >
-        <TextView
-            android:id="@+id/contact_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="4dp"
-            android:singleLine="true"
-            android:maxLines="1"
-            android:ellipsize="end"
-            style="@style/ContactListItem" />
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/contact_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingBottom="4dp"
+                android:singleLine="true"
+                android:maxLines="1"
+                android:ellipsize="end"
+                style="@style/ContactListItem" />
+
+            <ImageView android:id="@+id/work_profile_icon"
+                android:src="@drawable/ic_work_profile"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:scaleType="center"
+                android:layout_gravity="center_vertical"
+                android:visibility="gone" />
+        </LinearLayout>
 
         <LinearLayout
             android:orientation="horizontal"
diff --git a/src/com/android/messaging/datamodel/data/ContactListItemData.java b/src/com/android/messaging/datamodel/data/ContactListItemData.java
index dcc7e20..b9c7e85 100644
--- a/src/com/android/messaging/datamodel/data/ContactListItemData.java
+++ b/src/com/android/messaging/datamodel/data/ContactListItemData.java
@@ -46,6 +46,9 @@ public class ContactListItemData {
     // existing chip for which we show full contact detail for the selected contact).
     private boolean mSingleRecipient;
 
+    // Is the contact in managed profile.
+    private boolean mIsWorkContact;
+
     /**
      * Bind to a contact cursor in the contact list.
      */
@@ -77,6 +80,8 @@ public class ContactListItemData {
         mRecipientEntry = ContactUtil.createRecipientEntry(displayName,
                 DisplayNameSources.STRUCTURED_NAME, destination, destinationType, destinationLabel,
                 contactId, lookupKey, dataId, photoThumbnailUri, isFirstLevel);
+
+        mIsWorkContact = ContactUtil.isEnterpriseContactId(contactId);
     }
 
     /**
@@ -84,13 +89,15 @@ public class ContactListItemData {
      * optional styled name & destination for showing bold search match.
      */
     public void bind(final RecipientEntry entry, final CharSequence styledName,
-            final CharSequence styledDestination, final boolean singleRecipient) {
+                     final CharSequence styledDestination, final boolean singleRecipient,
+                     final boolean isWorkContact) {
         Assert.isTrue(entry.isValid());
         mRecipientEntry = entry;
         mStyledName = styledName;
         mStyledDestination = styledDestination;
         mAlphabetHeader = null;
         mSingleRecipient = singleRecipient;
+        mIsWorkContact = isWorkContact;
     }
 
     public CharSequence getDisplayName() {
@@ -157,4 +164,11 @@ public class ContactListItemData {
     public RecipientEntry getRecipientEntry() {
         return mRecipientEntry;
     }
+
+    /**
+     * @return whether the contact is in managed profile.
+     */
+    public boolean getIsWorkContact() {
+        return mIsWorkContact;
+    }
 }
diff --git a/src/com/android/messaging/ui/contact/ContactDropdownLayouter.java b/src/com/android/messaging/ui/contact/ContactDropdownLayouter.java
index 7df62de..051ebeb 100644
--- a/src/com/android/messaging/ui/contact/ContactDropdownLayouter.java
+++ b/src/com/android/messaging/ui/contact/ContactDropdownLayouter.java
@@ -34,6 +34,7 @@ import com.android.messaging.ui.ContactIconView;
 import com.android.messaging.util.Assert;
 import com.android.messaging.util.AvatarUriUtil;
 import com.android.messaging.util.ContactRecipientEntryUtils;
+import com.android.messaging.util.ContactUtil;
 
 /**
  * An implementation for {@link DropdownChipLayouter}. Layouts the dropdown
@@ -99,8 +100,9 @@ public class ContactDropdownLayouter extends DropdownChipLayouter {
         Assert.isTrue(itemView instanceof ContactListItemView);
         final ContactListItemView contactListItemView = (ContactListItemView) itemView;
         contactListItemView.setImageClickHandlerDisabled(true);
+        boolean isWorkContact = ContactUtil.isEnterpriseContactId(entry.getContactId());
         contactListItemView.bind(entry, styledResults[0], styledResults[1],
-                mClivHostInterface, (type == AdapterType.SINGLE_RECIPIENT));
+                mClivHostInterface, (type == AdapterType.SINGLE_RECIPIENT), isWorkContact);
         return itemView;
     }
 
diff --git a/src/com/android/messaging/ui/contact/ContactListItemView.java b/src/com/android/messaging/ui/contact/ContactListItemView.java
index 6904da6..b0e8957 100644
--- a/src/com/android/messaging/ui/contact/ContactListItemView.java
+++ b/src/com/android/messaging/ui/contact/ContactListItemView.java
@@ -53,6 +53,7 @@ public class ContactListItemView extends LinearLayout implements OnClickListener
     private TextView mAlphabetHeaderTextView;
     private ContactIconView mContactIconView;
     private ImageView mContactCheckmarkView;
+    private ImageView mWorkProfileIcon;
     private HostInterface mHostInterface;
     private boolean mShouldShowAlphabetHeader;
 
@@ -69,6 +70,7 @@ public class ContactListItemView extends LinearLayout implements OnClickListener
         mAlphabetHeaderTextView = (TextView) findViewById(R.id.alphabet_header);
         mContactIconView = (ContactIconView) findViewById(R.id.contact_icon);
         mContactCheckmarkView = (ImageView) findViewById(R.id.contact_checkmark);
+        mWorkProfileIcon = (ImageView) findViewById(R.id.work_profile_icon);
     }
 
     /**
@@ -100,11 +102,12 @@ public class ContactListItemView extends LinearLayout implements OnClickListener
      * @param isSingleRecipient whether this item is shown as the only line item in the single
      *        recipient drop down from the chips view. If this is the case, we always show the
      *        contact avatar even if it's not a first-level entry.
+     * @param isWorkContact whether the contact is in managed profile.
      */
     public void bind(final RecipientEntry recipientEntry, final CharSequence styledName,
             final CharSequence styledDestination, final HostInterface hostInterface,
-            final boolean isSingleRecipient) {
-        mData.bind(recipientEntry, styledName, styledDestination, isSingleRecipient);
+            final boolean isSingleRecipient, final boolean isWorkContact) {
+        mData.bind(recipientEntry, styledName, styledDestination, isSingleRecipient, isWorkContact);
         mHostInterface = hostInterface;
         mShouldShowAlphabetHeader = false;
         updateViewAppearance();
@@ -152,7 +155,11 @@ public class ContactListItemView extends LinearLayout implements OnClickListener
             mContactDetailsTextView.setVisibility(VISIBLE);
             mContactDetailTypeTextView.setVisibility(VISIBLE);
         }
-
+        if (mData.getIsWorkContact()) {
+            mWorkProfileIcon.setVisibility(VISIBLE);
+        } else {
+            mWorkProfileIcon.setVisibility(GONE);
+        }
         if (mShouldShowAlphabetHeader) {
             mAlphabetHeaderTextView.setVisibility(VISIBLE);
             mAlphabetHeaderTextView.setText(mData.getAlphabetHeader());