From a4a6503d30ed21402847dbd25849ba2dc68a1369 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Mon, 27 Sep 2010 15:53:44 -0700
Subject: [PATCH] Don't show X for notifications that can't be cleared

Bug: 3038418
Change-Id: Ic27c2e686b918c0238b85658700925c51311df06
---
 .../drawable-mdpi/status_bar_veto_normal.png  | Bin 699 -> 1139 bytes
 .../drawable-mdpi/status_bar_veto_pressed.png | Bin 1192 -> 1139 bytes
 .../layout-xlarge/status_bar_latest_event.xml |   6 ++--
 .../tablet/TabletStatusBarService.java        |  28 ++++++++++--------
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_veto_normal.png b/packages/SystemUI/res/drawable-mdpi/status_bar_veto_normal.png
index f9a7cc2d1a81867064770f80d043d571f043a7e9..3b7c9c7c9da5643f61a3ab083b4481aa1d2d69e5 100644
GIT binary patch
literal 1139
zcmbVM+iTNM7>`bd4(pf?qC@eJ;k;m*OKaMMcC&5Tt+345RqcbqvgCA&TP`MNHXR6?
zQ*e6{=Y#s<WCJgtR@j>pw>Jfm;SCWHeDF>2FHk&b*XhGhFp!+@ob&yD-#wE(-5tJ$
z<_3Zwe3?!$>#g{0-B^#myT_U)@v;M@@~GD=prUL;BCeYK5M*?D0A``Amd-qfQG%!|
zXt_MfOI?Cu>H*o)3Ann2(F74~cP&{Nf(Z1(0nLb!-yc6Efu_dD6Ne;PvXXF6>m0RV
z?`U^U868r1m27VVQCGkOIz%#X^<l#i+!$Hm6|n3bQzWRUprII9bt*6QfTU?da410g
z6`G>~#{`&QC>#zS1T4+a6wOi$>u173kQHbetUM&PW~&7uE2dX$;a!XzM92~-s#q)r
ziot+s4^Rxx^BxDw`mu)JDH%w1{f5(0V-TUE*qVhj(*Pc$+;5Jc7>PZthM-%Lv`TC^
zD~ZA>qg>gdm;g=bx))bP+d*0Q+l@7~om|O+R2Dksh^^py6k2LvoV&jp@)WT*!Vz1;
zMUjU^QyI~rfihx@#5Vy|Qw2U8N=6u#4T&txMHq%>Xg<PnY=}vxcs9<}IM%{O;=wqZ
zNCy+V7-SeR&2wTR#YMs*&&A`Z5MRS)3<t@E0&8|PY<C6A{uL`EZ73tt&Y9+Ltpj=n
zO=LQQrUjC{At1?$W_WwAJk@ALXlrMonzl_HRPrlmYuNvH+*PdlKRKhYGnCgHe>6+&
z2zQ_-uC_kjtPT$}@Wj}7G~Op0c|2CL88M!7KYYEq<QoH<iAQIM^s?{dc+<6s&)b)p
zP~EO2Ur$%2{HpoK_2s!u`=88zoM^o;^Qrz$<I!6Ur)Ec9N-o!7Bp$ZeFZTNK%Z-bd
zXCm^p#hsVV)mwYEEUbIfe*eV!$6KwbXYV@uPM<8d^=5LVh4NhC?y-H*57Rep+lR|<
zoa6EGynTH9^@03bKupzPVeH=BoABb#4d2#pCZ5f=ZU1s*dbjr*$fUZ(2Z_G(zW_|J
BZZ`k`

delta 673
zcmV;S0$%;|2)hL#iBL{Q4GJ0x0000DNk~Le0000O0000O2m$~A0B;qluaO}qe*#@e
zL_t(|+RRl;OKM>hO}&UBNj}PuaH2SoK#4{{qXsn)M3BJ0&?HdMi4##la3D=ooHrH3
zB%C-X1Peq^!9q(>d?7x_x2Si~xroS7D;nHAIB>qR_xjdedwt*8+WN19LZSRx)kZAJ
zXKW}TmP8_vLZR5W|KZ`G+wInBf3@U$v)SzX`}>!d7o}3k=krOE_V@Q~He0jVoXuuB
zosI;B!C-hi9(=A;D(Q4O6bfBjTrB0Bo}NBEJs~HNNSvRalhYQ9#UCFZNXqB)xm>Q-
z>lqA&c{@8hJ4T}s>qrO$0z4jXot7$<>fzyGFc`eOy|vrzNF>7La<MLxf60QuARubB
zn#E$--rio+i(IC?y}e8((`vP{+3a{c_IkaSmzTf=N<1FdXf$7%FO^Eg6O|xUE|&|1
z!e}%a4u?ST`FsZl2Vb=o5rDh7xj}uS(U^S(c(GWlbqp3?P(Z*<r&D;O)9G+HoXKPY
zQgk{U+JD>qCnqQ2a2ODPf3DZ-5UbzstJUg7*6TW&502=_@Au!{-l9SH6L6_iN+=YP
zo)VJdbA5f??RKHG!{NY;VHVT_H<?VLL6^(5ju8<|Cev&-!#nU~G#cIA-6ht~&dz{~
z@x8vj;#kZZTzL-db~{9=R;#5_iJ&u2z$-d^e}69)i?EVJB3bF3cdM%_ObT*5K0d-k
zO9?Rd^Yb&9#$qv8^zQDCoDrHr2KbvyCV@aey4msZF}x1RLCtElt`tZvmmeJ+t@ngp
zuLmio(}_#sXLsp89ceV0R4OGPeh9QQZ_@Gq`K@2WUjYUH>LN%6C)XRc00000NkvXX
Hu0mjfW@|cn

diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_veto_pressed.png b/packages/SystemUI/res/drawable-mdpi/status_bar_veto_pressed.png
index 4461ac8ac928091c438ffddf3b5830895c8fa29b..3b7c9c7c9da5643f61a3ab083b4481aa1d2d69e5 100644
GIT binary patch
literal 1139
zcmbVM+iTNM7>`bd4(pf?qC@eJ;k;m*OKaMMcC&5Tt+345RqcbqvgCA&TP`MNHXR6?
zQ*e6{=Y#s<WCJgtR@j>pw>Jfm;SCWHeDF>2FHk&b*XhGhFp!+@ob&yD-#wE(-5tJ$
z<_3Zwe3?!$>#g{0-B^#myT_U)@v;M@@~GD=prUL;BCeYK5M*?D0A``Amd-qfQG%!|
zXt_MfOI?Cu>H*o)3Ann2(F74~cP&{Nf(Z1(0nLb!-yc6Efu_dD6Ne;PvXXF6>m0RV
z?`U^U868r1m27VVQCGkOIz%#X^<l#i+!$Hm6|n3bQzWRUprII9bt*6QfTU?da410g
z6`G>~#{`&QC>#zS1T4+a6wOi$>u173kQHbetUM&PW~&7uE2dX$;a!XzM92~-s#q)r
ziot+s4^Rxx^BxDw`mu)JDH%w1{f5(0V-TUE*qVhj(*Pc$+;5Jc7>PZthM-%Lv`TC^
zD~ZA>qg>gdm;g=bx))bP+d*0Q+l@7~om|O+R2Dksh^^py6k2LvoV&jp@)WT*!Vz1;
zMUjU^QyI~rfihx@#5Vy|Qw2U8N=6u#4T&txMHq%>Xg<PnY=}vxcs9<}IM%{O;=wqZ
zNCy+V7-SeR&2wTR#YMs*&&A`Z5MRS)3<t@E0&8|PY<C6A{uL`EZ73tt&Y9+Ltpj=n
zO=LQQrUjC{At1?$W_WwAJk@ALXlrMonzl_HRPrlmYuNvH+*PdlKRKhYGnCgHe>6+&
z2zQ_-uC_kjtPT$}@Wj}7G~Op0c|2CL88M!7KYYEq<QoH<iAQIM^s?{dc+<6s&)b)p
zP~EO2Ur$%2{HpoK_2s!u`=88zoM^o;^Qrz$<I!6Ur)Ec9N-o!7Bp$ZeFZTNK%Z-bd
zXCm^p#hsVV)mwYEEUbIfe*eV!$6KwbXYV@uPM<8d^=5LVh4NhC?y-H*57Rep+lR|<
zoa6EGynTH9^@03bKupzPVeH=BoABb#4d2#pCZ5f=ZU1s*dbjr*$fUZ(2Z_G(zW_|J
BZZ`k`

delta 1170
zcmV;D1a15C2&f4miBL{Q4GJ0x0000DNk~Le0000O0000O2m$~A0B;qluaO}qe*{WN
zL_t(|+N@PeZyRM4P3GaTJ$^fm?Zl3gl9Hs*;G~Huv=O4KLKmn-Y$^mQ&;_FEf(<Kv
z1Ph7;i<E~{fl!MO0Sc(1AOR{(MVhp6EGMyCg5zhLdi<Oh=bItUIFucu(RlpLH|L&v
z?zwlmy8fr5`(F!&6;=I@m&noHf2k@8c6I=D(=^#akt-f6imY$y*h5h`DTbvO1~;lK
z%c7`AB4Z3fGc0SdGG;TtWU(bR8&b20O)9W(k{A?Y;uy2VWaY6Ff5m#OS-Ib;3UoUT
zf|#8yTW=sZe#n0?ia0dQ;C)4waUmcKc33P<x6S8w^oK*!PfnkC!{YH4e-d{Ql4%2h
zh}G@wJup7==G#_JPkiq3pTGZ-i!W6+H=05PIT94NhwlyeMjjb^_SC@P8Bi<VOHmMn
zqG&xYie@;w!yVao<lI|<gA;hrGd$Wi5rdT58|f~fSa}d}g$IX^9iKjP4tr{);?0W}
z?p(Q4FBipnoiVCN@`_IBe}8F?bA=*EGqW(y*&KN48W<WqacUrTlyf)>$@q;A-T~ig
zKHC%o==cvK!i`}e2ZB5L!kpcSs$w0gRSQ|95FDSJeDQ4P&|&15{`LC&>;*0Bzv|_Z
z)Tm>T-eVCVpRMLM`zK;FYl6<4&2A6&+x)?i<ImxW_{(#b7e4*4f4G(qa+!L0OKvtu
zcvUq3sfwyCp<XP{L(wjkm<<9uLlK5Em)4W>7vEd^@oG7}F66SPIxNyQ8f~yK-Xp&h
z%OZ|@@FA$HXN?P9Ui|!%%<cK|z4cl#FIKC>UqIP8D5LM&&QwG(A727zpy)wx)2a!u
zA5N)(bR;9n4v-cWe}**iHjB$+_4)$ilLL>>z#s$!O(2P=KwoqkCV;cy%#N1StE{&e
zZQ{&!2g;9(P~-6zUNSq~C`wDHz+Z|a;XSyyw3?_Eav&wQT6-92rZjP=4vOL#8jhZR
zb?n6R;Ig@REB^JBQYzWAe+){4l*wuX+5GaNSQXF{KsRF1f8dFXfZ}`jz|_mH4<0>+
z;E?l=OSAcvJ3=-iiLJn+6Qrn;#P|BarIcC~YgJ$wX9JBU=Dj{wcqsPT`N1PkV>iz1
z-G$^2b6cs^MtQ4NDxfpq0NpRna0Kg>%m%cFQFeg{9iKmX`jydVP9g#%NL>B$*2nL|
zHJTh%EH=uef8b+N7#(0?b~qh<q2#r18{1{M)l_$Y7*a8ojXd!bh^$@zF7f?W`Q;_J
z7DUjB5R0NWbIXgjKl><l_B_LJ&=ei77`W_egr%+Ydg|wEE8l!kTwTH3KnIEFAXy?q
zQkHd6XkG8{Ncy**ZqB|-X3PC;IJ*tkjh<qyRw#w8Xobymzsb65wW&y|VdXKQc%R=h
zv>yT?W$=YFux%HJbO88cFllpI)#h}EN3;=)v4<I;O$dpMU<4C8tkk{t%kiL(hd%Jh
kM*$rJc^~v$_*;Mh0PvZJP;+h0!2kdN07*qoM6N<$f`nr%W&i*H

diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_latest_event.xml b/packages/SystemUI/res/layout-xlarge/status_bar_latest_event.xml
index fa492d0788348..049a1cc79951e 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar_latest_event.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar_latest_event.xml
@@ -8,12 +8,14 @@
     <ImageButton
         android:id="@+id/veto"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_centerVertical="true"
         android:layout_alignParentRight="true"
         android:src="@drawable/status_bar_veto"
+        android:scaleType="center"
         android:background="@null"
-        android:padding="2dip"
+        android:paddingLeft="16dip"
+        android:paddingRight="16dip"
         />
 
     <com.android.systemui.statusbar.LatestItemView android:id="@+id/content"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java
index 41ae06a3d50ad..0e26f5241678d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java
@@ -733,19 +733,23 @@ public class TabletStatusBarService extends StatusBarService {
         LayoutInflater inflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         View row = inflater.inflate(R.layout.status_bar_latest_event, parent, false);
         View vetoButton = row.findViewById(R.id.veto);
-        final String _pkg = sbn.pkg;
-        final String _tag = sbn.tag;
-        final int _id = sbn.id;
-        vetoButton.setOnClickListener(new View.OnClickListener() { 
-                public void onClick(View v) {
-                    try {
-                        mBarService.onNotificationClear(_pkg, _tag, _id);
-                    } catch (RemoteException ex) {
-                        // system process is dead if we're here.
+        if (entry.notification.isClearable()) {
+            final String _pkg = sbn.pkg;
+            final String _tag = sbn.tag;
+            final int _id = sbn.id;
+            vetoButton.setOnClickListener(new View.OnClickListener() { 
+                    public void onClick(View v) {
+                        try {
+                            mBarService.onNotificationClear(_pkg, _tag, _id);
+                        } catch (RemoteException ex) {
+                            // system process is dead if we're here.
+                        }
+    //                    animateCollapse();
                     }
-//                    animateCollapse();
-                }
-            });
+                });
+        } else {
+            vetoButton.setVisibility(View.INVISIBLE);
+        }
 
         // bind the click event to the content area
         ViewGroup content = (ViewGroup)row.findViewById(R.id.content);