From 13e3920a0f730b9badb75ae736c3666e21d2efcb Mon Sep 17 00:00:00 2001
From: Karl Rosaen <>
Date: Tue, 24 Mar 2009 18:42:19 -0700
Subject: [PATCH] Automated import from //branches/master/...@140852,140852

---
 core/res/res/drawable/ic_emergency.png          | Bin 653 -> 605 bytes
 .../layout/keyguard_screen_glogin_unlock.xml    |   2 +-
 core/res/res/layout/keyguard_screen_lock.xml    |   2 +-
 .../keyguard_screen_sim_pin_landscape.xml       |  11 +----------
 .../layout/keyguard_screen_sim_pin_portrait.xml |   3 ++-
 .../layout/keyguard_screen_unlock_landscape.xml |   4 ++--
 .../layout/keyguard_screen_unlock_portrait.xml  |   4 ++--
 7 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/core/res/res/drawable/ic_emergency.png b/core/res/res/drawable/ic_emergency.png
index d99abf83e72549c3208528f19efd4451ac294299..45d0f21736c3d79be3b5ce9776172b607041d91c 100755
GIT binary patch
literal 605
zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq000#L000#T1^@s6sTZY|00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXG>
z7Zem}NVHx600G@eL_t(I%cYdRY8ycihrcsZ%ylbJaR(_RaAAow3fK@ghNR0|n7B;s
zCrD*drVW0IkSc*RDO|{%?Ly?z7^yM2?xt8!irYJ{|L7E?EpF#_XTF=;`RychjL$MT
z`bBvL97M|(hq%)Z{_^LlxTFjEUEa)lkd1ICieX$*Qo-V_|B<hXlP>5OmpN#GiZa1b
zLe>?x)3vE#wqRSdwlUNq%L3N6g+Bd6ooBTM-3gsiKAZdX8mN4d$<fr8XGV1ZDNq3^
zhobE{K6ln1Wwe}nYyF`@NiSZBJ59dI>$#F<V;mY4<bOxwZ@?9EO3xy>;@z?*wP+sK
z+dQa*bsq^ZvV&*){EHzffHzDOd;mxtsA8B`5QAo4cwnoqVFV7+6iOSX00^KK=pU)H
z@%3Orn*^$;hn>{9TLw9(Qh9qInJSWf75!{ux3dp!gC1$$-HGmxPuR=Okx5qPk=9{<
zO1LhlZi==j4J3UzL`Oq(;O_nFvtHP&IPPpHzjxm+na!W9r@J}%>`Std_{&*wU-4)z
zW<|I7*Ii8WL61J@*RO9X>+gP}N3r(Zwt;F3jb*iEm(sqw<wag=5-?G8kmLI9ZsRl6
r{n1IfH#|q8PVa5O&HR{etK<Fw)v>k7H4CAa00000NkvXXu0mjfoO=*<

literal 653
zcmV;80&@L{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!FG)l}RCwC#SG{i3KoI_n7HQq>NhxfJ
z;!aADJJB3cD6T<*H{cB-Qc~v$s3J;Q#9KfGQkoPgE*(i>VH)IX5biw1O3tjk_AOu^
z*(mZAoGp9C`#0at%r|=%lx2x+UJtP4YX@NK07O?~5Cpvw-ii6MbL6M2K6RQe7EmXz
z_2pULyuM@)x;i!i_$;1hBOsbWLGn#}Um`~VtX}9Zu`dAO>#`YCq*yk_jhr)>oIwqe
z1JX*eIyr5F03b&r3xT%Bg7yB3JHqe=ur$%`@X6I30dyweTc+Al=cj~%sTNlIGjbth
z8~3i<cq69eQd2wLNQv;`iBKo}advAOetfvdcw#iGsD@snn-Z1m^A#C#jn&KYJifID
zCVCW&L`^i<cN1^Y{1!I$+F8NTb34ndFhh)Af+DXFNYl!$Bq1wV856Y;W1O`4=JuxF
z^f|iJ7PMVwQ?=<&LfI^6jaj3uas5XXXvQ)~5@-RNb)@zL5GwTp<G7k!X!?z2g;RnG
zCp3-TN^OUYM+o=SPrncx&W>>qeSnxp_5Q-z#CMMFRf^&|ZO1kS!^acIDL-Si9$)9i
zijwrG4}kY!^lkrDi6r~mYx^<c<bB|K7<m_>JW1Dnb7Y#N_g9GiReZ@Nl}RqL6qJLW
z1r|05YQJeH0I~((QgOi3Q0_5BAH_B2D=#q5nX+mF)$TP1<l*!<JeV*=onJtjR=CcN
n@W~%Qu={7U1MuGixDj9gGPcl8hcd__00000NkvXXu0mjfxx*!J

diff --git a/core/res/res/layout/keyguard_screen_glogin_unlock.xml b/core/res/res/layout/keyguard_screen_glogin_unlock.xml
index 4834b28a945fa..74ff3b029cca2 100644
--- a/core/res/res/layout/keyguard_screen_glogin_unlock.xml
+++ b/core/res/res/layout/keyguard_screen_glogin_unlock.xml
@@ -120,7 +120,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:drawableLeft="@drawable/ic_emergency"
-        android:drawablePadding="3dip"
+        android:drawablePadding="8dip"
         android:text="@android:string/lockscreen_emergency_call"
         />
 
diff --git a/core/res/res/layout/keyguard_screen_lock.xml b/core/res/res/layout/keyguard_screen_lock.xml
index 952fc5d9dc60b..b5fbace148614 100644
--- a/core/res/res/layout/keyguard_screen_lock.xml
+++ b/core/res/res/layout/keyguard_screen_lock.xml
@@ -211,7 +211,7 @@
             android:layout_marginTop="5dip"
             android:layout_gravity="center_horizontal"
             android:drawableLeft="@drawable/ic_emergency"
-            android:drawablePadding="3dip"
+            android:drawablePadding="8dip"
             android:text="@android:string/lockscreen_emergency_call"
            />
 
diff --git a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml
index 881652ba6cbb9..4c583d84eeb28 100644
--- a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml
+++ b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml
@@ -87,12 +87,7 @@
             android:layout_weight="1.0"
             android:layout_marginBottom="8dip"
             android:layout_marginRight="8dip"
-            android:paddingLeft="4dip"
-            android:paddingRight="4dip"
-            android:paddingTop="8dip"
-            android:paddingBottom="8dip"
             android:textSize="18sp"
-            android:drawablePadding="3dip"
             />
 
         <Button android:id="@+id/emergencyCall"
@@ -104,13 +99,9 @@
             android:layout_weight="1.0"
             android:layout_marginBottom="8dip"
             android:layout_marginLeft="8dip"
-            android:paddingLeft="4dip"
-            android:paddingRight="4dip"
-            android:paddingTop="8dip"
-            android:paddingBottom="8dip"
             android:textSize="18sp"
             android:drawableLeft="@drawable/ic_emergency"
-            android:drawablePadding="3dip"
+            android:drawablePadding="8dip"
         />
     </LinearLayout>
 
diff --git a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
index fc82e3f9e7178..ac404f26649b1 100644
--- a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
+++ b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
@@ -76,6 +76,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/topDisplayGroup"
+        android:layout_marginTop="10dip"
         android:orientation="vertical"
         >
 
@@ -249,7 +250,7 @@
         android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"
         android:drawableLeft="@android:drawable/ic_emergency"
-        android:drawablePadding="3dip"
+        android:drawablePadding="8dip"
         android:text="@android:string/lockscreen_emergency_call"
         />
 
diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml
index d0388a6663fb4..929d0a22c61f5 100644
--- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml
+++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml
@@ -85,7 +85,7 @@
                     android:text="@android:string/lockscreen_emergency_call"
                     android:textSize="14sp"
                     android:drawableLeft="@drawable/ic_emergency"
-                    android:drawablePadding="3dip"
+                    android:drawablePadding="8dip"
                     />
             </RelativeLayout>
 
@@ -108,7 +108,7 @@
                     android:text="@android:string/lockscreen_emergency_call"
                     android:textSize="14sp"
                     android:drawableLeft="@drawable/ic_emergency"
-                    android:drawablePadding="3dip"
+                    android:drawablePadding="8dip"
                     />
             </LinearLayout>
         </FrameLayout>
diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml
index 59cd7a36dd93a..a6c31b6c47255 100644
--- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml
+++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml
@@ -85,7 +85,7 @@
                 android:text="@android:string/lockscreen_emergency_call"
                 android:textSize="14sp"
                 android:drawableLeft="@drawable/ic_emergency"
-                android:drawablePadding="3dip"
+                android:drawablePadding="8dip"
                 />
 
         </RelativeLayout>
@@ -108,7 +108,7 @@
                 android:text="@android:string/lockscreen_emergency_call"
                 android:textSize="14sp"
                 android:drawableLeft="@drawable/ic_emergency"
-                android:drawablePadding="3dip"
+                android:drawablePadding="8dip"
                 />
             <Button android:id="@+id/forgotPattern"
                 android:layout_width="0dip"