From 9a20aa74ca83fe53546b6f4cfb9d805d0cfd3a9c Mon Sep 17 00:00:00 2001
From: Evan Millar <emillar@google.com>
Date: Tue, 13 Apr 2010 09:51:21 -0700
Subject: [PATCH] Clean up the fallback state of QuickContact

-Show the generic avatar by default, until otherwise set
-Add padding to the nobadge asset so that it will be square
-Remove states from the nobadge asset since it is not actionable

Change-Id: Ide7da78782a0db9047de52af6f9c1f654fc6a1b5
---
 api/current.xml                               |  11 ++++++++
 .../android/widget/QuickContactBadge.java     |  11 ++++++++
 .../drawable-hdpi/quickcontact_nobadge.9.png  | Bin 0 -> 1019 bytes
 .../drawable-mdpi/quickcontact_nobadge.9.png  | Bin 0 -> 1016 bytes
 .../res/res/drawable/quickcontact_nobadge.xml |  26 ------------------
 .../quickcontact_nobadge_highlight.9.png      | Bin 675 -> 0 bytes
 .../quickcontact_nobadge_normal.9.png         | Bin 390 -> 0 bytes
 .../quickcontact_nobadge_pressed.9.png        | Bin 675 -> 0 bytes
 core/res/res/values/styles.xml                |   1 +
 9 files changed, 23 insertions(+), 26 deletions(-)
 create mode 100644 core/res/res/drawable-hdpi/quickcontact_nobadge.9.png
 create mode 100644 core/res/res/drawable-mdpi/quickcontact_nobadge.9.png
 delete mode 100644 core/res/res/drawable/quickcontact_nobadge.xml
 delete mode 100644 core/res/res/drawable/quickcontact_nobadge_highlight.9.png
 delete mode 100644 core/res/res/drawable/quickcontact_nobadge_normal.9.png
 delete mode 100644 core/res/res/drawable/quickcontact_nobadge_pressed.9.png

diff --git a/api/current.xml b/api/current.xml
index 56dedaf3be59f..b559c4d88e2eb 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -206418,6 +206418,17 @@
 <parameter name="excludeMimes" type="java.lang.String[]">
 </parameter>
 </method>
+<method name="setImageToDefault"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="setMode"
  return="void"
  abstract="false"
diff --git a/core/java/android/widget/QuickContactBadge.java b/core/java/android/widget/QuickContactBadge.java
index 07c3e4b673407..50fbb6b30c269 100644
--- a/core/java/android/widget/QuickContactBadge.java
+++ b/core/java/android/widget/QuickContactBadge.java
@@ -48,6 +48,7 @@ public class QuickContactBadge extends ImageView implements OnClickListener {
     private QueryHandler mQueryHandler;
     private Drawable mBadgeBackground;
     private Drawable mNoBadgeBackground;
+    private Drawable mDefaultAvatar;
 
     protected String[] mExcludeMimes = null;
 
@@ -117,6 +118,16 @@ public class QuickContactBadge extends ImageView implements OnClickListener {
     public void setMode(int size) {
         mMode = size;
     }
+    
+    /**
+     * Resets the contact photo to the default state.
+     */
+    public void setImageToDefault() {
+        if (mDefaultAvatar == null) {
+            mDefaultAvatar = getResources().getDrawable(R.drawable.ic_contact_picture);
+        }
+        setImageDrawable(mDefaultAvatar);
+    }
 
     /**
      * Assign the contact uri that this QuickContactBadge should be associated
diff --git a/core/res/res/drawable-hdpi/quickcontact_nobadge.9.png b/core/res/res/drawable-hdpi/quickcontact_nobadge.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..68d43c469ba20643bab347cc8abe5236fb448571
GIT binary patch
literal 1019
zcmeAS@N?(olHy`uVBq!ia0vp^IzVj7!3HF)VmW~VOqQ9>&H<jz&I$oV`DvLssSFGi
zjB6+RXIw52Ile!0rL<4lRNwWCt(vPZEp2_9wtd^=U6)$*T-7T)CV%NS%k;Rk>Tomr
z$9>%upOrQ>bIg0@ddF9g)%Akm`$vTqH(cFo_8*DwdT=9E|Ier2PoDn0SH1sxoxQ@o
zwYSRD*$!;6SzeXtw`W(4ugoncna3tV7R$2M*=nCoHM;3uw%;LPzuo-weQHy$+xx!^
zO8WHp@2q9>>h_#hS|?Ykp`ftD!|)o9<?$VIn-2Y$mR_B5Icd$-khwqf3Qq;Ds(fVn
z=wjLleaY+2b*Fc%H@$hw_tBQ6+jSMpd~6m=uXCHDY*rF(+&Odp{be^*|9@0Jl5To?
z;nt7ekEBP$W~fz`2x^#}c>c99?-$30Z+(}l4KDbuVLHB_dHpBmyXVpZv>!g%aQlQu
zqjh46tcT5)zjL(@T(C@dzxw_EsPBLGE*GihzH#Gfm7o2Fr3((RKUna-;QYe!2f}X~
zRbE{DZ@I=hVJh1^VV!3UZ`eLOk~1*mRoTyI^m2+!(o7!tMBalbO9FJJADuO2t`dK{
zZrXD9y<AUN_V!18J*9Lu*`)5qyfp=7zr9`0^?s}A+`LXq%wqkPPon2|)AybF*;W<#
zEGJ^C>bWv?i{JIhXI;OwMfc={MR9%AJ9GSHX!e}^GI6EqyBaP#Bj<AM_HR7DExhZK
zJEQBAmx6)KEjr64@SRtVRQ}0xLvDWHwA1-vlYKt+R~*aj*ZdUwyYF(|Hk-m}d5b3s
zc~2`-RQ1ZtIwS9!y)MvT^1TNP42-p&E{-7?tZ!!qW*s)*X`5@(W5ZL`dsid<OmA85
zM%xx0?`7vVbG6!qG@aA)SfI5m=+F1n!a~|hkKg>bBl!5t<^!LFUUZcx-Rqw3b>)3Z
z#L*oY<sat@Ny<0ZBy>Ff;aa0J@$sx}r=I)>dZhMINn#U6ji~+f6NSFNC!PG*FSKy4
zcH%U~l=G)I?U8qv-hN@->q{1W`HQ%B-FFeKQQWgG`&N0KPwngKl&AH7gOlV|BwQ<q
z6Y99TP510)pCZ%Q%QShNryalKA}!UwX4fpO<3|*4FrEz&YVqA6bJ7tvlj)&Zoc_Bh
zy$^2XA20X%>)madbLgoD-yyz?Ws?+eGq3$koY(nMeS_=#-oH29cziRQlb3rp>3-Kf
zXq0y}q#%#`#bN6uFAKNanX+*9mX!$}%Cpw~oOU~IH<#KYj{IF4HGUmxauE38&r~&i
jhiUp-*@d%j)iGWZ@%ONpy_5x*sTn+7{an^LB{Ts5e6H*n

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-mdpi/quickcontact_nobadge.9.png b/core/res/res/drawable-mdpi/quickcontact_nobadge.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebe747bfa63e05d50aeeb42c113f84d9f37d5f14
GIT binary patch
literal 1016
zcmeAS@N?(olHy`uVBq!ia0vp^IzVj1!3HGNBP?GrFfdtWIy(n=Iy)-_6y>L7=A<$(
zR4}fc?4NPDK;-!T%$3qUX;XdIGq!53zO=OUZQAy2lXqQe)pJ#^@R<Ci-z?MP(yGJF
z>>u}aSA165)XXvOnd=>2K~~obhVLI0THJ7Tui1YjzU#q_RQ*4nem{Bo_g?k>?{)SH
z`_|qnQ)fG{#b$X`rr(}jHNG;poMaxG2w5!4T4$?$I@Rc=d)a=6g#C8&)Ay-Oy>9RS
zGAQZO<G-_(&8ypUUTK|NsfL2W5)Z>`JeJ3I$Zb0GV_JH3%H^arTSMml&?`I@xT^Az
z>7$EjC-fz+JJ+4wvEKCNE#F65mTuQoF!QllEWOTcj<Q)vxN+yq`S+LIRQ>-^{Ybj$
z?S)%Eem{~P5u2e_St6)mcH;Th#=Kt~8@}~jsy4XbyN2obe&+R`nD3rT3($V}WW((f
z9*x$CDY70mU;fV3K5)S@;r;6O|D(SD-Md_*n)}9$t5tsX8<s9O#QtEx`-1Ze%O428
zZB%)2@xSF7?}Vvr^MrMtHN0W_@JP<UkXL0tqtVMLGD$Oe<P&)hrYs52nSONEl(|a$
z?Ye2p-S=`mVcFXs_4Sm}*<_Qt8}rr_l>PR0J=goKrgQT;F)@qvTRw@N<4xap>StS3
z<g=WJt*YnB)GdD3C!clw))w896BfnwRqxF4m!a8n^2@}Ps_$yJ?2MetwcEe({I>9}
zPwtGaQ(g)NHn-?3o4|KoIa2v2&kecxfzwXshfVhR*k5rhw_o#9?C-wIdE0CXr{yi4
zDC9k@Oi|S<GwY1JZ}z%CgUR<EFfcGydAc};WU#)S8JO2>z|+R;EX+T-s`qY(ana(~
z<S2Q8WP|$1o~TUztxL5kH>h6s%szade|wY4(&sln?r}aovH5`K0&Qibd)@n|teAgt
zOV>x~8%OKCQtEg<H7WLeT>T?L>G7;>r%rxcdc^mUro<+W8sYs@PV86~`}E0=^v(<S
zrW)ij+&sNWNB;Q5WA;JUOEYDTmtSPPo4<(5j&uF%S>NXB2jBlC7x{Blz2_NWQ6K*2
z(;VJx%gvmZK56w$6W>gUO*T=&xfwQ_US+M4QRh3zm$7V;Le8P59(;#zGKDy{f2{bp
zAcy68omE}HtN5rd8#t#cTXI-0nCaDon;Ch%eW!YweWU8HoHggok}{m6rL1!~r`>ta
za(a(w@WIMxhx~hrXXV^a&o+9ama8RksUt0O-_zXnv8=*{E#`YSYWzCXbU>H!?ZeyO
hOJb_`K8nxX|Df65BRG}oFEB?lc)I$ztaD0e0sz}u<IVs8

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/quickcontact_nobadge.xml b/core/res/res/drawable/quickcontact_nobadge.xml
deleted file mode 100644
index 922fa0e8ba336..0000000000000
--- a/core/res/res/drawable/quickcontact_nobadge.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* bubble_with_chats.xml
-**
-** Copyright 2009, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/quickcontact_nobadge_pressed" />
-    <item android:state_selected="true" android:drawable="@drawable/quickcontact_nobadge_highlight" />
-    <item android:state_focused="true" android:drawable="@drawable/quickcontact_nobadge_highlight" />
-    <item android:state_enabled="false" android:drawable="@drawable/quickcontact_nobadge_normal" />
-    <item android:drawable="@drawable/quickcontact_nobadge_normal" />
-</selector>
diff --git a/core/res/res/drawable/quickcontact_nobadge_highlight.9.png b/core/res/res/drawable/quickcontact_nobadge_highlight.9.png
deleted file mode 100644
index f0f50b36eabc88c92d29335f8d993065ca8d1a37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!MM*?KRCwCl*->iTFc1ddk!3q2Sumu9
zo}iFB^(n78P;Zb^<O(^!Lf`UG2!uk}O<20tOlK@P6nhq{kXS<nLLnIQ?eDR6B{?F3
z_h`;JzBRcwzpsG#=5k}{6?dOT2W6WiiQGdPB><{NICuHG<^Ca!ZDH{5)DLOw1wDeR
z1l(}%(zq!M-lzU6jgm5sV4srh=yAJ+a0C<0H{d>BU8Qsd)z1_DaS!nFWCMKu3DT3^
zB_sS@!x8*&2k`Sde0%v?)OvG%3vl^m1h;YGaa7H&JU(-Y@5-ku2C+=q931$C><{I^
zVi3y`m@oi^zPMKmVp&dDz-Rz0h8!>jz9@w9B@sfjOj@m#1Q;m^Enyvu!9YobTrjGS
zV(o@(aELk6S}*}V^)6L<!e{`DgCzq@>ik!thQ;zfCX9ec<zKqtN#}q`zi|DMK+x8k
zCu*1sfOSVDzcJ?t8v$zxPnY6^0PnT*|0nPe9OTq6s28rEaI`Fc(;07i!ek&}%1oGe
zJxT_G7XvAqPm0X*h28+zr|puZgsYl+Qy$C)u`Gj~A+XB;gJ7%Hz;w_?OBUFll?RI<
z3+x4KAYn21?1YVg^Gc#tKiT@=CR&zDqE<iI`Y&A*Ez1e>WbM6ygnhJ}*q4xRZP_Z^
zUvxEK-@rB8mIZ%opy~$RKG}v-sS%7LxaL|X1GAbm7vKF6JpAY#kG%vgXB?IfWe#lZ
zX9+_*0Ff<tYsX$Vt>HfX^9V){7GFz3t)I!_w7{B94eXBq0|4ItMjlyp_cZ_j002ov
JPDHLkV1kC1Dk%T}

diff --git a/core/res/res/drawable/quickcontact_nobadge_normal.9.png b/core/res/res/drawable/quickcontact_nobadge_normal.9.png
deleted file mode 100644
index 01cc9dce7d7c53bd45fa64bcf24cc194ebd7fbfc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 390
zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!1|;QLq8NdcWQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2cMh#CF$B>F!Z*KZ_9X8-$O}NRc*zL65(EOBS@#39snPO^R
zZ#<qp(d*^;WhOUL=Q(JYB-n+pKRWSrPHK0-xv5JxSO4C{F#YI8gG<xzWR?b*UpN`^
z$z5A&f_3xsBc<_07jA{K>CbY^X1R4BuJQLI_O-uHJ&63gLNwNo?OtX&zhcY#wcoyS
zpKs(j{9)-`+r{@vD<Z`_HBA}6$*uW1-)?2#y6+#j*vyV;Ts8?k+V@x^_PXSb|JgfE
z$Jyy{sLe=d;sg_UQa$Bo`kC?zMV?PnfQ$ZHpYYqRr#$J5VA}4+_nUi<tl3tol`8AE
z{XyHI1Fs_v9E*Elk|v|epX#(RE=}gT>@fxw<JN1(;$D{VyZ`;D)5|BOAN?rsirpML
e>+FAA1`HF5iobvPCSDE<SO!m5KbLh*2~7ZJ6{eK{

diff --git a/core/res/res/drawable/quickcontact_nobadge_pressed.9.png b/core/res/res/drawable/quickcontact_nobadge_pressed.9.png
deleted file mode 100644
index 6e22c871572f7b6da42d79968313080947e3ac23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!MM*?KRCwCdnL%z8K@3Ih>ZV1cNMXSd
zvS7yrxJItPf&*}rTq4(q*s);8f+Mg1Wk|wImmRyhIvS>{HD18jlw{RtWVK%Z`sJx9
zBQwLl7>Fp3X8h~VRbY9zK3F43bah7X9jYWr<T|SW+|S?=`gxFeS?9qScw6JK&Z9!l
zz^MYBOI+0X+!=UN<7b^!WtxGzs_X^-`0^EK3n4}t0AIa*Q`Oz+yi|DeSr*`X4B+84
z)Rn%gjIi(F3HbgKz{5AVzP)l~{qXJv;Oue+9;U*BoEDiR9;bVMb(KL`4qdWL6#wSm
z{=mx6*h~GQ_>q)7&hEUd43rJPnwUp_U}fNJRG0z)D+8H<16YErmLQsz!@Ecb0}>g4
zb1vcUVckplcv;h>pa8(iz+?iZW}=6OxnYUaT8c0VTP#6k)5Y*GnG_BL%vRvmo1NSe
zWiOc(rT_}B0P7j^Phf5)p1w*@VOanl{uSqyrSJhZSVE3#%{MzeFc+5N9#&uu0KCGH
zn%5TrfD1zdBf)<*R)8@88d`yqq^1D4sfm}CiCw)2@*Z7fIR=bLeog#=l|fkyz?#_m
zTS6EREefZuggfvGM^oVx09YAp3X5;TC~Wd@LYO)T-X6xnVo(^GiKkZ>p`}~DcY@HX
z!p(5@3wXSP_m?02p@jvecENT!5Ak#Tq8T{#JKz@qu3Htj-|YjJ!|~kqQgH2YL~hDF
z3hTH~7^Vh@_7tMEz39-xWBqamK^u$DmRKn(uBZ65w(pYw0{|$3Ol6B&SC#+(002ov
JPDHLkV1iL}G6ett

diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index b5fff968f9d1e..f9b06679ff11f 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -552,6 +552,7 @@
         <item name="android:background">@android:drawable/quickcontact_badge</item>
         <item name="android:clickable">true</item>
         <item name="android:scaleType">fitCenter</item>
+        <item name="android:src">@android:drawable/ic_contact_picture</item>
     </style>
     
     <style name="Widget.QuickContactBadgeSmall">