From c1c3b6f21ecddbb237195caedc36af442ebf00e8 Mon Sep 17 00:00:00 2001
From: Andy Stadler <stadler@google.com>
Date: Wed, 15 Dec 2010 15:26:30 -0800
Subject: [PATCH] Use generic contact icon for notifications & messages

* Copies the icon from contacts
* Used whenever the sender doesn't have a local photo
* Used in notifications and in messageview

Bug: 3282187 (notification)
Bug: 3285156 (memory leak from the placeholder graphic)
Change-Id: I528cae20355aa8cce7be37b26f32aa90e092708b
---
 res/drawable-hdpi/ic_contact_picture.png         | Bin 0 -> 1487 bytes
 res/drawable-mdpi/ic_contact_picture.png         | Bin 0 -> 1719 bytes
 .../android/email/NotificationController.java    |   7 ++++---
 .../email/activity/MessageViewFragmentBase.java  |   5 +----
 4 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100755 res/drawable-hdpi/ic_contact_picture.png
 create mode 100644 res/drawable-mdpi/ic_contact_picture.png

diff --git a/res/drawable-hdpi/ic_contact_picture.png b/res/drawable-hdpi/ic_contact_picture.png
new file mode 100755
index 0000000000000000000000000000000000000000..7c34f5c94bced4278508f594ef898b7ff6cf8b68
GIT binary patch
literal 1487
zcmV;=1u*)FP)<h;3K|Lk000e1NJLTq002<{002=40ssI2CGFi|0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%aY;l$RCwCto9RyDN)Ux11TH&-gq=Xb
zDxRH(Vu^%60R-9D!~Mo3Sspua-0im0J=71&Gf8kCSJkOg)%N7Y#l?iPRwxwC&(Aqt
zUS4)Oout2-aM|YO<^bI9_j|pb!kuy&^Wx$n$Jf_aVE-1(3kwSzyWOr@MmU|!#5O0%
zGue5}^YinP%*6I@!7RxPdnqNeG0am_Q)BV7Mlxf?^w-|s-(Ol<YBU<HRxABqo1UKj
z&$HRtSxH*XgI{=mfB*jeetUZxC+5k?Nmd5(>+9=wyRC<lK;^~(gY%I!Irz_=ot>6v
z$+Ox3W;|T0)hHVW2M0>9xl^T5X=P<aN{*h*dbY8#@%8of^78WV@bK~RkvV24<m&3G
zUa#XN@%G5#F*7q$E|&ppkO+#!V%f9j=Vy?|xV>oPdca2U3T(X1Ef|(&gznbX*6QkN
zcHFk=8R2$&dppqQ#%h&#o614NN~lL8d2@5~^z<}Sz`nr_CnqPBN(H*fus%blz$U1o
zuvx*`*%?{KM|ldh?d|Qu!^05s8(smh334B{NF^@JIr%m&xpsVf3{z&P!vr?<Q(zw*
z9T8w-SLTo_QI?_h6xfIdXj!C%4F;P~%#HDO)JUO`>cWUomLcb9&qjWkN(R?vf*JNA
zs&k;LX0v&JfB*CI137PaHu5Ly>+6LqI3pjxP{!Te9e_FK2>65(BEu_#oMDT63Q|<|
zB<wd#E{*_0gyoaQBI%-%HgC+-Vd?MkF?5cM4SW(=US7_ruktUswzigM?IElnj;E(5
z5}Pu?)uS>qL(E)kZ*MQ*CC$R7{3uHlBiE)##N-mBiW)_tSRzgg_!+Skqb{i*bkryZ
z&dIlGwVG#}k(HnSRQcgB8jXek##*fw-Tc`7oEEc8Cx(6c`S}^@+BHUY)?tP%W1LLb
zhd#}%dS`_h+ANhy@l70&pD^>?;4l=(Na+Km(@wVAZ2%J#38j*~n1jQI7+dyi!Wv5z
z+iB*~PWl-(vS$X8WOPHx=yW<{nLg&AzPHo*{eIUopaw_$`j|ueM)p`YU@}n%CL^Yg
z*{Z;%wIXN*XJ|W`b<%YTS`iESn8#jqP<S2B!0F3de{GAN{qbsKuAYj+^2Z4_5aLpx
zB5Xq{7=$uNh+mr~<~$!P5Xu#(p@x)YNYDZ`v_WGYbJqRfFv=CdD>(6|-YCj0KgUom
z@FYL6lmnTfwjXk!T*B3-T$8)=dOr&}!64=O&z20N+;L(KEz}6*N_EMh1nT>lb&o7p
zF_a4n`jnfqyeX!M&w-eQa(lfV{tRs(`IIZ>USCBC39dVaa#7|!<&J&mnF=#LjG<i8
zQY4XC${jQ27tcbJEBVRMhFM=GvmsyoNp-Pd)|D1Blp{|TigLh0iCQj~<q3^{VKyW)
z%1WgYR0U-0<Kttq*`xx=|Jbtyl@>FKuU4x?1679A+>4u=8+oEro)@=)iq#sVXjfdX
z*JCo15Rix6#Pdoo`B;j1cXxLr<&x*sYE_yW)%QQF!z`ntgo7b@RMmz(w^W!D?n?x}
zj2iPP%}LBk<69AuR4?aJx}ZJr@n7lEdk4c7%&J|nB)@Yh{TF6cjUg2aeWo!&um!Vf
z;Q_PsOm0=ILZ~HH8tze|wO{PA1+#{(lHEzSXe><Bs!=MKKRx>`n2~PMdpYFlFlI<t
zRac3t9ZKmiW^|S6>SYq>5Oog_UaG4XWkQK2Mt%!s|D6|CTs;6YYD|@c#nldD)*vKF
zX=;1Qy}NN@RxLb2-4MPLeWe*cQ=(-g>@a5XS+&P<NQ4d@66lFg)h@+t%rscESx!uU
phhmOysm2?PwDgtsSFHa97ytxY1@UAY+<pK6002ovPDHLkV1ha9)xH1#

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_contact_picture.png b/res/drawable-mdpi/ic_contact_picture.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a338e8e219bfc4f2ea7a2cad847479855e7435a
GIT binary patch
literal 1719
zcmV;o21xmdP)<h;3K|Lk000e1NJLTq001@s001@!0ssI211J580000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&SxH1eRCwCNnO9HbN)UyYVOVmGBcjCr
zf8_s=gb+c9oZ)^uXK!s$)%Mz>dqqE3w#ROtK6NVf4DIdhy}rKw_@*&FKEAuVdw6(w
zb8}OCU}R*Z`||Sg_V)H&5a;LTA?Wt@wu+|D&(F@#(9n<X8<UfhFa1&V0Ps5Bh;Mj!
z7(?IR-`79(oe;;y#*o_G-Cg}--R3jG`P9_Z!^6Y-`+F-Wy!cD?-EODzn~{%?4;%n1
zbHarG8AQIZy}iwh`}_M$-NcB1;P~_BPcA$CVNSq0xn!Qj#YNot`T4nO<t-rMbVo-=
zJ3Bi7Jvcb1LOC%pfuF+n=;)|?5kPkIyz0*C>gw|HG9ClatE;Q0r>DUoGOn+$iD6q?
zTbrAkocOOYrl+T&1aNTn*&i&!A_kY7>!?eeLmo%gv$C?n>wMz;{M-ZWw$(Tb#Xvyh
z^T)@>LdgdpV|I2{w$oQVGS8pg^oX?>#=^n^OTE0j1gH$v9l#TLpSgtc<m6;-Zm!qs
zVK@VqV{HIhbSd*BjIg%0hBcso%kE(D;^N|hNttN8KR9PDZ^U5JfX^;%J!W^Ah1q~e
zZah6b9Xu|=B^t+PHKYH4z8YX<r_p$Pd?W#ieiMM^B!+BkYz)Yv<cI{#uMJk<EHLUx
z<%n|-C71;L;e|}=m&);1v>FT|i$j7&NpOfvRh1%fJ}nX=@!~9i0TUq6fygK0+PD3A
zRiN=q>v@8x<pmthOTwOSZD=e)d@+1pJym{MG_fw1mX<gtDPR+lP*D%<ASxW77)w?@
zyjg4ui6kTQo<V8}rU(mb2NC;X8bPry5o5`)Gcz-UZu^EmDRS)D$~OluBUrH)3Ur>G
zoe{c}8*y;zE6+rLn|bvod2OxT1(GBekCLcnS%ENFFUrq<M@<a(%GOC!h&+vzgXgN0
z!V^_Ws{RYMGd-C2Os_eZ`#Y_*hy-QC5SD>Onu0&lpp}EUZYb)k7}5=&oi~LD0^B**
zh|B_uSpXrnRpE=BRDY4&Ck#FG2l2cGiy<tB2;%Ql`DQUPoA`i5s|74&8pSnSu-h;r
z^JrLfuK9}QE6Unn(ZL`RkkMoT%eqy}f_F;a-G;tG#3@D!?|?NS+Lp=@dVm63;>-$c
zghY<PT)=`69@gYdSu~YY$vh`IU8+eCVOS7M5N2H;(~?mUI)vel>cT$V;Ib);RjM!6
zts+3Mq<X*+K`m`U6|exOR@z`Gz6RAcf|x7nP<{qj*bzW<bU|JuN!S9M>}XNYqG{0%
zO+7jU6no#~r7(dJAN#}PC0GipT81@;!TocpY{w$p;4vy7^d&V@l9#~wO$(`B(KN^_
z`+HS$(}G3iU$rT~!hG^aV3~9zFWHgBSSuZL64>$qJX6@t(6Gfjlrtc+y+GszAWUhy
zB3@p(X32GAF_jOP05AJP@|x}sU?DFEvl6Ci3nh!JraH_Kw?(~3r9)_y9c{(F{LW$0
zD=#}-E=r0?tDB=V3?VGoqL!A2S|tHQ{3cfn_5D;$K+VtlvaMif47a|%j$7CZ$d0<7
z(wa-)(hcQEluNH-W03ojBA5BR>-Xljx3@v*yHB|6^?GVhpcBN}yYU3nXPTnOLPuNQ
zM*gX~VF*)(eMrHjWx-*=mpA`%6P>HTssgN-S91~GF}9Fk&W~Cm%<-#i9pqI!`c9=u
z(yH3-`O>@KC5mcQY%6XP6vG~7vBoa8p~YsUrg@Eq#!vCzs*k}gKF%_p`@^fpqx2&u
z^bksXJj(gdFXPYtxLVBOj+>lGO2uiyW5HE(k?V2))t^G2`o&$SolJ|FODH7&nyr19
z4Z;nLW>vwPL;BzU8lo~NJ{@+kR5}!cPIjaGYhHYKGQ@{35HX@0HhkOmOqKf3gXEZd
zrD8(MyHI&ICpVV<X2;Kn&a8OODFJ*C$sKH6BgdLXu^9Y<w}m7gH%zc~{^QrvDLH0I
z1lGg$NKNTp3?Sk13q%ZU*`-*dz#?~GQ7g%W6~7nmSMAp2m|xg-;s+SYo9QM;+9G8_
zlVcH9G59t7116Uyom^epwtZd}a>QxGw{0>tDN$<@aq!~oPo3~Ig#tzle=qvil&tla
zZ&f-jx@U3!vq~7=Z@L)HKY<Z}2vx-@Umhb{15q1d|LfoC*y<kv1^`DO+)p#WB6|P;
N002ovPDHLkV1hYMN>%^>

literal 0
HcmV?d00001

diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index 6d524b238..64241cd7d 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -57,7 +57,7 @@ public class NotificationController {
     private final Context mContext;
     private final NotificationManager mNotificationManager;
     private final AudioManager mAudioManager;
-    private final Bitmap mAppIcon;
+    private final Bitmap mGenericSenderIcon;
     private final Clock mClock;
 
     /** Constructor */
@@ -66,7 +66,8 @@ public class NotificationController {
         mNotificationManager = (NotificationManager) context.getSystemService(
                 Context.NOTIFICATION_SERVICE);
         mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        mAppIcon = BitmapFactory.decodeResource(mContext.getResources(), R.mipmap.icon);
+        mGenericSenderIcon = BitmapFactory.decodeResource(mContext.getResources(),
+                R.drawable.ic_contact_picture);
         mClock = clock;
     }
 
@@ -221,7 +222,7 @@ public class NotificationController {
         Notification.Builder builder = new Notification.Builder(mContext)
                 .setSmallIcon(R.drawable.stat_notify_email_generic)
                 .setWhen(mClock.getTime())
-                .setLargeIcon(senderPhoto != null ? senderPhoto : mAppIcon)
+                .setLargeIcon(senderPhoto != null ? senderPhoto : mGenericSenderIcon)
                 .setContentTitle(getNotificationTitle(senderName, account.mDisplayName))
                 .setContentText(subject)
                 .setContentIntent(contentIntent);
diff --git a/src/com/android/email/activity/MessageViewFragmentBase.java b/src/com/android/email/activity/MessageViewFragmentBase.java
index 55ecac316..21ec9fa30 100644
--- a/src/com/android/email/activity/MessageViewFragmentBase.java
+++ b/src/com/android/email/activity/MessageViewFragmentBase.java
@@ -544,11 +544,8 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
         showDefaultQuickContactBadgeImage();
     }
 
-    private static final Drawable sEmptyBadgeDrawable = new ColorDrawable(0xFF808080);
-
     private void showDefaultQuickContactBadgeImage() {
-        // STOPSHIP Show the default 'Andy' icon.
-        mFromBadge.setImageDrawable(sEmptyBadgeDrawable);
+        mFromBadge.setImageResource(R.drawable.ic_contact_picture);
     }
 
     protected final void addTabFlags(int tabFlags) {