From b59b94456b3a8fdfdf524a81274839f657fbb65b Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Wed, 30 Jun 2010 16:25:33 -0400
Subject: [PATCH] Fix icon size in intruder alerts.

(Updated test app to confirm the fix.)

Change-Id: Ife56cf07f282786162e2ebc5aaddbb24dac6cafd
---
 packages/SystemUI/res/layout/intruder_alert.xml  |   2 +-
 .../res/drawable-hdpi/stat_sys_phone.png         | Bin 0 -> 1184 bytes
 .../res/drawable-mdpi/stat_sys_phone.png         | Bin 0 -> 746 bytes
 .../com/android/statusbartest/StatusBarTest.java |   9 +++++----
 4 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 tests/StatusBar/res/drawable-hdpi/stat_sys_phone.png
 create mode 100644 tests/StatusBar/res/drawable-mdpi/stat_sys_phone.png

diff --git a/packages/SystemUI/res/layout/intruder_alert.xml b/packages/SystemUI/res/layout/intruder_alert.xml
index 24eb960da7455..ba4a77471ef06 100644
--- a/packages/SystemUI/res/layout/intruder_alert.xml
+++ b/packages/SystemUI/res/layout/intruder_alert.xml
@@ -44,7 +44,7 @@
             android:id="@+id/alertIcon"
             android:layout_width="25dip"
             android:layout_height="25dip"
-            android:paddingLeft="6dip"
+            android:layout_marginLeft="6dip"
             android:layout_marginRight="8dip"
             />
         <TextView
diff --git a/tests/StatusBar/res/drawable-hdpi/stat_sys_phone.png b/tests/StatusBar/res/drawable-hdpi/stat_sys_phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..98155538e36462e104a0a8dce65379329e2de57f
GIT binary patch
literal 1184
zcmV;R1Yi4!P)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00009a7bBm000XU
z000XU0RWnu7ytkSQb|NXR9Fe^SWPHyK^T60uD>Mt7YYk0NpTaKo3dafq*$>~iVaEG
zvapbdtjI!HSO|%-V&hAapIi}EY{<VP`Td+b&$(vq%$(E5_jB*9+kI=A_q_AYJkNP&
z=AAi*=)e4n5lBc#2#<}8T@MNhdSUNp{D}fAU;<l?=@<DSEG*1<baa%PpPx@jNl6qK
z7$`UUU3a-$baHa?Wo>QkYg$^GlL6#$kN~cr&d$zuMMg$C7<<|L+x4@vGrGOKecRdD
z5s^?L22w1nWEhymKPSLs;*b#)VgUg^1Nip#Ci{4-M?^$WX=y3t<>gU&dOAHnKhxIM
z7EMe{(DCuH?RXrUH!8#sDPKrMM@LglO$`+n7gI<`2*)6{cB!bShzbh}X>4qa=H})^
z8&~vMQiy?+x5UcI%BZfc&LqLX^crLv8X71*KAuKKMwDh9S0VQL`sy*UsHiAvYil#7
zO+j+=P+ne6cXxL*K0YqIfGvx%;LwOI{MnM2m`MHo{T`9x;MLXD6cZC8uykTd#6U<7
zDIZ9$v$C?NtE-E!&~;&3pF%@Jm35~3JUu<p{r$bb1GX%dh=KV>1qryPr^iC-@bHk@
z+uNz4qJjnn24oyXKR-XG*49?Kxw%oWWG9b_Aq8}Hc3Pq_Iyy@A_4Tx}vSNZQEG*FF
z<)w^e>ihfq)Y#Za2L}fVDSavxVjr!o%*;%4`htUl1t6vbQNk{R&d0zs4Gs<pKPaoK
ztJKocLZ_#v!jJpwQ>m;mutqYp6Krv;DdZ$B4-XIKl&r6>bCXif&(BkCZZ75I<j~aA
z6wS`g(&OW!;=>>Gh$&}fa&oc}7Z=BUm3nAshzbe{gbgpy+}vzNK^T2dE-o%`DhNJG
z#1KxMIk1p-WKyv8_4U#6@-kGv$cIy@6T=iDfy%<JDdy24+kDk^TqR;?)R{LmH4(Bq
z7v#C_?rw`8Z}+x#OAMss#h;RrLY0-33YOF9q>YUY#paI(Js?WNKuTtgL@D1AK!DxZ
zC?g|-_V)Jt!AFcC2Lwj33-G|M(gw~iE=x;GgxsYI^40M0F!lEKnz>7F_vZQP>I%z4
z@Da-UU<U3~5FF6EySwjZ`)YG@lWJ>g&4g+1@p<d@^);LYA0_jn1#^ueFL>DP1jkcV
zRh8(&`+8IB;|qrG4MuqQudk@Z#YId0k_TX4ID`Wow+UYbM;H^q#}YB51712hI+V>I
zgJYBM8v^(DrIyFG(+z9@xv-qYuH#l=Hw?v3?&FQl$hiG9GaL?wrA$vxE6mu}j>X5W
zpC`5tiM=~0zXt#?IXP*PW62fkP-(a8<E4#tvlq93B_$<BYHF%mA2zHn?e?tLJ>A8=
zihUW_tG>Vlw#-V|l`JCP`41J@>38b*c>_#f%Qzx$z{qZz;p}{LvNe_S^70~naL66}
yt+U@yE|zAtXJ%%;ZEtUz$;{sv|Hu2Q5%>XaYk7lkDIsqF0000<MNUMnLSTZ-oi`u=

literal 0
HcmV?d00001

diff --git a/tests/StatusBar/res/drawable-mdpi/stat_sys_phone.png b/tests/StatusBar/res/drawable-mdpi/stat_sys_phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..402abc75b71ddb397c9eb5bf202e6a945940040b
GIT binary patch
literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00009a7bBm000XU
z000XU0RWnu7ytkQoJmAMR7efoRXu28K@cAGED{k>V+vCSRK&*0!p6cjrCL~6r3eJ8
zfMp0GqBbI=u#i}#)IzWl!NOXx5G=&XAW=y`@L%7(*~=`xGsc&@E(6Q#&dh$_?#}Ek
zz>gEF)fzrMJ)MXf6aKd$4&u=vDX3#InbvBxTIF;);pF6m%-`0t*$f(u2CP=A&2TvU
zg#ety?RE=iXJ?>NsbmA6pPz%cI1s_$_4Sp{+iW&48jYY{uQPnc#Ml&n_%Ps@I2;bR
zy1D|F%f&-8nG95`RX$dH;Guz&AozN{=0TrzG#U+DUtfdQ>)msQ!(rHNw@|56m~VHn
zoCFEJBDuW0gk&-aNOVYW0nKI;27`eFOGy(Jiv=M2XAM{W`1r^P5Tw;=(Nu|ke}88f
zh)2Rnmdho~=kvXW1b26L6c71)9(+C@#N%;p!;Y9_2m}H!9*-FY;*s#<LT0h-$j-FQ
zW`js1!fmlw3`(UE8~1uWczSvQzuynJTn?U}pLra1c6Y){_~PP1z>*{}8jVmW6hN!h
zGE+1fg<`Qt?xPw@y5H|hOBi>77l{O`g$T0Q?A}T#?vUO+70GeY7Cjyhy9WsH^6~<S
zMB)(EK|5h#04KquQ?hPuZusPOyA3*>j@@c*l+i&v5}p(BIT7@FJ=pDbsMTuZXL>T3
zuq0z%<jULI8<sM|=Ov8y1JBWHHt*qJZbG3D^J9#hhIl0WxX^%G>~uQhljw9h&HNJM
zKMVw=Qps8>l@fNPTrP7T#T?TjKmJR5BKfRtZ*Lio_)G`}gF)gGXUZKj5}x>vi4taf
z6j8d}uEhS0!7e`F=d-q0EOJ-)WgOxl9xa9^J{Sz%i+}Tjct-NSMnd^ZiyzizI-TBQ
cvHUFg4Kz!kRU)%H<p2Nx07*qoM6N<$f(C6+d;kCd

literal 0
HcmV?d00001

diff --git a/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java b/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java
index c6a4134d8a8ab..b665d2f09b4a7 100644
--- a/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java
+++ b/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java
@@ -89,11 +89,12 @@ public class StatusBarTest extends TestActivity
         new Test("Priority notification") {
             public void run() {
                 Notification not = new Notification(StatusBarTest.this,
-                                R.drawable.ic_statusbar_missedcall,
-                                "tick tick tick",
+                                R.drawable.stat_sys_phone,
+                                "Incoming call from: Imperious Leader",
                                 System.currentTimeMillis()-(1000*60*60*24),
-                                "(453) 123-2328",
-                                "", null
+                                "Imperious Leader",
+                                "(888) 555-5038",
+                                null
                                 );
                 not.flags |= Notification.FLAG_HIGH_PRIORITY;
                 Intent fullScreenIntent = new Intent(StatusBarTest.this, TestAlertActivity.class);