From b2c6429d4dc95118237d8a10237b9b005b339fb6 Mon Sep 17 00:00:00 2001
From: Mark Wagner <mxw@google.com>
Date: Mon, 28 Sep 2009 16:39:20 -0700
Subject: [PATCH] border for the non-badge case

If we don't have a uri/email/phone then we do not display the normal
fast track badge.  But in that case we now have an alternate background/border
rather than no background/border.
---
 .../android/widget/FasttrackBadgeWidget.java  |   7 ++++-
 core/res/res/drawable/fasttrack_nobadge.xml   |  26 ++++++++++++++++++
 .../fasttrack_nobadge_highlight.9.png         | Bin 0 -> 675 bytes
 .../drawable/fasttrack_nobadge_normal.9.png   | Bin 0 -> 390 bytes
 .../drawable/fasttrack_nobadge_pressed.9.png  | Bin 0 -> 675 bytes
 5 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 core/res/res/drawable/fasttrack_nobadge.xml
 create mode 100644 core/res/res/drawable/fasttrack_nobadge_highlight.9.png
 create mode 100644 core/res/res/drawable/fasttrack_nobadge_normal.9.png
 create mode 100644 core/res/res/drawable/fasttrack_nobadge_pressed.9.png

diff --git a/core/java/android/widget/FasttrackBadgeWidget.java b/core/java/android/widget/FasttrackBadgeWidget.java
index 8c8e054c4577d..ba8539f781b6d 100644
--- a/core/java/android/widget/FasttrackBadgeWidget.java
+++ b/core/java/android/widget/FasttrackBadgeWidget.java
@@ -33,6 +33,7 @@ import android.provider.ContactsContract.CommonDataKinds.Email;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnClickListener;
+import com.android.internal.R;
 
 /**
  * Widget used to show an image with the standard fasttrack badge
@@ -48,6 +49,7 @@ public class FasttrackBadgeWidget extends ImageView implements OnClickListener {
     private int mMode;
     private QueryHandler mQueryHandler;
     private Drawable mBadgeBackground;
+    private Drawable mNoBadgeBackground;
 
     protected String[] mExcludeMimes = null;
 
@@ -119,7 +121,10 @@ public class FasttrackBadgeWidget extends ImageView implements OnClickListener {
 
     private void onContactUriChanged() {
         if (mContactUri == null && mContactEmail == null && mContactPhone == null) {
-            setBackgroundDrawable(null);
+            if (mNoBadgeBackground == null) {
+                mNoBadgeBackground = getResources().getDrawable(R.drawable.fasttrack_nobadge);
+            }
+            setBackgroundDrawable(mNoBadgeBackground);
         } else {
             setBackgroundDrawable(mBadgeBackground);
         }
diff --git a/core/res/res/drawable/fasttrack_nobadge.xml b/core/res/res/drawable/fasttrack_nobadge.xml
new file mode 100644
index 0000000000000..538e16546f533
--- /dev/null
+++ b/core/res/res/drawable/fasttrack_nobadge.xml
@@ -0,0 +1,26 @@
+<?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/fasttrack_nobadge_pressed" />
+    <item android:state_selected="true" android:drawable="@drawable/fasttrack_nobadge_highlight" />
+    <item android:state_focused="true" android:drawable="@drawable/fasttrack_nobadge_highlight" />
+    <item android:state_enabled="false" android:drawable="@drawable/fasttrack_nobadge_normal" />
+    <item android:drawable="@drawable/fasttrack_nobadge_normal" />
+</selector>
diff --git a/core/res/res/drawable/fasttrack_nobadge_highlight.9.png b/core/res/res/drawable/fasttrack_nobadge_highlight.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0f50b36eabc88c92d29335f8d993065ca8d1a37
GIT binary patch
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}

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/fasttrack_nobadge_normal.9.png b/core/res/res/drawable/fasttrack_nobadge_normal.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..01cc9dce7d7c53bd45fa64bcf24cc194ebd7fbfc
GIT binary patch
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{

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/fasttrack_nobadge_pressed.9.png b/core/res/res/drawable/fasttrack_nobadge_pressed.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e22c871572f7b6da42d79968313080947e3ac23
GIT binary patch
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

literal 0
HcmV?d00001