From de9eef1c66208c0ef1b6aab6c27ec9c5ce014d97 Mon Sep 17 00:00:00 2001
From: Evan Millar <emillar@google.com>
Date: Mon, 21 Sep 2009 17:34:26 -0700
Subject: [PATCH] Add aggregated badge to ContactHeaderWidget

Change-Id: I0266828c7d560b9aefc3f58d27c217f710f1b0bb
---
 .../internal/widget/ContactHeaderWidget.java  |  10 +++++++++
 core/res/res/drawable-hdpi/ic_aggregated.png  | Bin 0 -> 883 bytes
 core/res/res/drawable-mdpi/ic_aggregated.png  | Bin 0 -> 671 bytes
 core/res/res/layout/contact_header.xml        |  20 ++++++++++++++++--
 4 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 core/res/res/drawable-hdpi/ic_aggregated.png
 create mode 100644 core/res/res/drawable-mdpi/ic_aggregated.png

diff --git a/core/java/com/android/internal/widget/ContactHeaderWidget.java b/core/java/com/android/internal/widget/ContactHeaderWidget.java
index 4a9c077c57c78..35d637d9e4265 100644
--- a/core/java/com/android/internal/widget/ContactHeaderWidget.java
+++ b/core/java/com/android/internal/widget/ContactHeaderWidget.java
@@ -63,6 +63,7 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
     private static final String TAG = "ContactHeaderWidget";
 
     private TextView mDisplayNameView;
+    private View mAggregateBadge;
     private TextView mPhoneticNameView;
     private CheckBox mStarredView;
     private FasttrackBadgeWidget mPhotoView;
@@ -159,6 +160,8 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
 
         mDisplayNameView = (TextView) findViewById(R.id.name);
         mDisplayNameView.setOnLongClickListener(this);
+        mAggregateBadge = findViewById(R.id.aggregate_badge);
+        mAggregateBadge.setVisibility(View.GONE);
 
         mPhoneticNameView = (TextView) findViewById(R.id.phonetic_name);
 
@@ -283,6 +286,13 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
         }
     }
 
+    /**
+     * Turn on/off showing of the aggregate bage element.
+     */
+    public void showAggregateBadge(boolean showBagde) {
+        mAggregateBadge.setVisibility(showBagde ? View.VISIBLE : View.GONE);
+    }
+
     /**
      * Turn on/off showing of the star element.
      */
diff --git a/core/res/res/drawable-hdpi/ic_aggregated.png b/core/res/res/drawable-hdpi/ic_aggregated.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ca15b10f4f735a49cbc20bd8328678eaabf023a
GIT binary patch
literal 883
zcmV-(1C0EMP)<h;3K|Lk000e1NJLTq001BW000~a1^@s60K&Z@0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#6-h)vRCwCNSI=t`K@{GZog|w!O`!(k
z#cKnatG6Ef(St}2p7i9Ue}#WU1pfhh5IqzcN^hkXZ!J;~3+<s05Q7#1l{9Ud>~3~<
z{9c@u?RF>KfF=(<CYj9a`}WOyZ@w_YFc`oA6UeB~G)EQyKH#Y_F#eHADTkv_&d6~=
z!BQj)<<thcz$M^fV`>tNu^ZP2<t)Fowe@IaW#u{N{K~Ei*y`%)hmDPmZ$tzSrD({M
z90CPTjZ#M-m(S;K$DNbS!PeH+UUj?O`u6trPl`fH0<>ljiJ+s1Tq8hEO~-MB?n&TK
z*xcNF(dl$9$35%Q)6*Z-YW002m#z^oB1xw;%d+x>aS4>m<r0QEon}&gh*4SU`#y_i
zY`D=hO_?^ylx0<w8M+8uG0*eZU@&0)exKuLIDHQt3Lzx&#n0t(5(rX~V56!akpRwH
z07chzX8;xi0i!q1X0sAb+Y1W|&iwqm2QtAJkw`}XZ_V26wpd(Td<>`8LiY=He0;oL
zDwS*`s83P3!4LJ9IaL{fs*Yh}OC*5sbCkcC<ecmltWv2w*xTFtS|}9U6a>m)LB$$d
za_LdhA?$qA6Nv;G*OQcO_gUm~u)DkadTD9t9la|zCTz$Tj{K=o^P?s>aRTayMc4$V
zLLeHDX%iS;M8ncR!UxkNFqoa4b*Di<sK#L9w)<Qx7U$6a^Q~6PYBU-}l*(ihL0uL_
z)iCY?_km^kpX}h^;G^<miHL9r<ri0?BR8oW2-S<P921GY8nt$Qe%@#{o1bt=IWY<M
zJ!yViqvN=z3t_L<Ye8r%W6i^zot@fE^COQSE;b?&@kTL(vmQkWd(1TRS2AA+UqxIF
zFP;z)n<0kK1wGwc93CFN!J0~Zjcz__M@L6*v4*5tMkmQADKBcZ+Ea**JGO0SNRZGE
znM}sVoPBa~(!|$Jy<UHLc6Mf=znjnoPJA8#$wv3mn)UVdFDlOhra1zxdPG+JX)$AR
z+xr{BKfi_QI%%FK>~+J+(-8>!1Jh_asnL8gg%*^Nb@I0W0|57iNfw73{!IV?002ov
JPDHLkV1m`~l3f4*

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-mdpi/ic_aggregated.png b/core/res/res/drawable-mdpi/ic_aggregated.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c2e2b09ddb659f88f9cc425245a8c15ae8a0ea6
GIT binary patch
literal 671
zcmV;Q0$}}#P)<h;3K|Lk000e1NJLTq000&M000#T1^@s6LLeTM0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!K}keGRCwB~Rm+MRK@_#ByM2-gn8ctV
z3}%@u#C>-86F<O3z90zxN(clpi}(vl7B1Wb2FXSp7?DJro>tL*RL<4gq%3U$;)O#!
zy6e=vr|zv1sl5q?Zi;c15t#&RAPqP?7Xm)8rM`mwmq>^sVj?Rv8jb5prSih}eJhj6
z1g%!<7v?=+!yBa%B8oI9oj4CX3xc3+S(Y7t7z_r(dcA&w?h*(RWC?iVmFWNxKLN^!
z_LI44G#cH_W-~7-eA~7oIOEo8wJ#VxF!}x)lkYqwDdD*Y!%##~lqwdB*QHWPVX=}@
z5>b-Y9gggP_+MNgU9DEqbzPfU+Q4xfRVWlf0<_<4a)LO=XC-6p4~TJaVm_Zc`Fy?x
z4>J@2S_L^qX#Ws-I-Nd6{1kX(%_)<D1LDnQBNvN>U9DE%=<|@{WxwD5xm+$cq^rr=
zY&PGQ%jKEpdAIF$`<7)%T>)?5-Di0Awb$!))R~5e=>T6-rb%;m()HYGLo`>cw<S}T
zw_T=5t{DH)?2@Zx1>xOG634}n<3lU~uW%0E&n6V&9hy6vJzjGTMx5x!H;z&f7RjXX
zDJc|_uK6~5Fn^j(r$102AE-SwHWQ0D%^f4X-nBH!?W$?t9*qs7^^r|wt6kER9gp2^
z_aoZp+wIoI{orS_S(?9}OeWvP<M9ptrzr2KKO7D_s8|Q3PEr5n()NWxY_Z1irDAbt
zvHsGCE`EJ1?bTVIA{N?n75A0)VhG~}5!yQaMNxkR7yyBXM=yYzO!)u+002ovPDHLk
FV1i(4D&qhE

literal 0
HcmV?d00001

diff --git a/core/res/res/layout/contact_header.xml b/core/res/res/layout/contact_header.xml
index e800dfa79903d..d19bb0484e919 100644
--- a/core/res/res/layout/contact_header.xml
+++ b/core/res/res/layout/contact_header.xml
@@ -38,8 +38,24 @@
         android:layout_marginTop="5dip"
         android:orientation="vertical">
 
-        <!-- "Name" field is locale-specific. -->
-        <include layout="@layout/contact_header_name"/>
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/aggregate_badge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingRight="3dip"
+                android:paddingTop="3dip"
+                android:src="@drawable/ic_aggregated"
+            />
+
+            <!-- "Name" field is locale-specific. -->
+            <include layout="@layout/contact_header_name"/>
+
+        </LinearLayout>
 
         <TextView android:id="@+id/status"
             android:layout_width="fill_parent"