From 14bee131da68404b33655a241de83c2eeb417559 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Wed, 2 Dec 2009 16:15:37 -0500 Subject: [PATCH] Fix lock screen layouts with emergency call buttons. Fixes http://b/2259529 Partially fixes http://b/2260798 Change-Id: Iabb3f74dc2a331810ae8ff44ebb319fe25d217ef --- .../btn_default_transparent_normal.9.png | Bin 0 -> 1611 bytes core/res/res/drawable-hdpi/btn_lock_normal.9.png | Bin 1394 -> 0 bytes .../btn_default_transparent_normal.9.png | Bin 0 -> 1007 bytes core/res/res/drawable-mdpi/btn_lock_normal.9.png | Bin 982 -> 0 bytes core/res/res/drawable/btn_default_transparent.xml | 24 +++++++++++++++++++++ core/res/res/layout/keyguard_screen_tab_unlock.xml | 4 +++- .../res/layout/keyguard_screen_tab_unlock_land.xml | 3 ++- .../layout/keyguard_screen_unlock_landscape.xml | 15 +++---------- .../res/layout/keyguard_screen_unlock_portrait.xml | 12 +++-------- core/res/res/values/styles.xml | 6 ++++++ 10 files changed, 41 insertions(+), 23 deletions(-) create mode 100644 core/res/res/drawable-hdpi/btn_default_transparent_normal.9.png delete mode 100644 core/res/res/drawable-hdpi/btn_lock_normal.9.png create mode 100644 core/res/res/drawable-mdpi/btn_default_transparent_normal.9.png delete mode 100644 core/res/res/drawable-mdpi/btn_lock_normal.9.png create mode 100644 core/res/res/drawable/btn_default_transparent.xml diff --git a/core/res/res/drawable-hdpi/btn_default_transparent_normal.9.png b/core/res/res/drawable-hdpi/btn_default_transparent_normal.9.png new file mode 100644 index 0000000000000000000000000000000000000000..617dba3e8de4c3dde26c880f7344d2f35ae5cfac GIT binary patch literal 1611 zcmV-R2DJH!P)XJ7S7){os z%bV0^s6VVYU!VH-)W4&7hrz%I)IGX`T6d)(uS#o)JO6~l>%3C#VVY;qs4=A~K1PJoGOlpCNTh9xCviH4X;lhi>;O(|jU5Laz-$mOu*EBmI83CT2yl1~JbAVX zSW7_(Ky%rIa1>;dA#y}N9hAexOZ57yBwgbpG+M1w+V8$9W z_yVAa8JCY+WnrSsI|U?UV_6^`5eN9sl*t!x{SXvWA-^1zpXWn z)uGW*am|qgWMQq8sa`M7}@#@mIaJI8bY;pWDBDa$9BReB0&7!>i4fn>3$(+nE z;}-#(w{X7HlP7VfCwI)4<1~EmmXr#B8dc`{#;F38LCowpo}SBK33F+@%$c{6~nlKCpH%Bm8R8dUCYvFm-ndC>0+w8 zIvu8m3&>=~!c@t&kTRxgNL;dUJ}1z%B&m*Y0V3tDfYW(s7!5QaBmj``Lsmg&_f|^ObKzF3xvVNhj* z=fb~L?9R^4Y`5EeM9)5TX3~PZ-=!QZWt&_D{82V7I_-f&C|e=`E?QKj{7~zyM%OQt@!AYS#b&002ov JPDHLkV1h;V8@T`g literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-hdpi/btn_lock_normal.9.png b/core/res/res/drawable-hdpi/btn_lock_normal.9.png deleted file mode 100644 index f1dac62e17b417d518c7b15cb935aa56c18f64c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1394 zcmV-&1&#WNP)M<=q0q2p4^-Q+2VuSI5ai= z2&9f1e~tP+w%&Bs^=QT#kJsI`;ALhs8tKvVen=z9vWB0eHAycyi2=&KO|nArmJ%_b zs(({*LGtskz`a58@!sCvW-ga|u)MsSSXx?gY}=MXh>m^H^}lGOh-!y(jxY!7Z(?2iNz`U>_-!DYrDIUpP?~poL%4Rx-59yju*Ab}qTDxTvU~sHzWX;XZq5X{C zw>ogs1Ohf9lxG5rP^^i59y$QP&V4GCa#b`K7@SSOpc)A~0U)J95hbvCR4w5oXvYW~ zsjO20+Za?h2xEQ>dRUZEzyZ*|aYF@NP2(a=8NO8=^#dovFy|csL2nU|(wYlEpWkJW5Zv$QLcZ|JN2QJL4w>wABf-_cY zGf1u8@bJQ{A%s&9I21~nfWt83l4^%-bG>FEjF?k15i3S;#@>nu?n2@MrvkDt1t+DS zQ4I&2jG|TqO&OzFjlETj2%H&nBT}pV>Zw(Y0CBE;L~@9+jdS*h;+%01wqo=LuG`pK zT{lL(MqzHeZEi%~Y6k)EdpC-tWlsEGM~LyA&#BJ6v=PEKv4v6D+*pGf`%p4b>uYCo z+F!RJB=JfzC%Q`>B5vl)=5tuS@>#+XhGC<(0rRmHi+gH;FKEKppOzQbhee+TL=0^hX%A;;$wPHb8_0H@1zU^TdHK2@l1zra2r3EsVNF=0}i7>1Luq8t> zC$!8FFzoVK$}xID4*F-$|1`YcDp9{NbE#CSGuh-_>R#0jYKsgCKQ_pZ0`9g}t4+DvRbWTBe-e;?x%9OoLOIAugdOTrS$ArvoUMgQ>dT&1lJt`E+^76^e%}si9bMqH&5aES^@I41?_1;o>3<%Rg2cW1^&e74)2dAf} z?^6ArTbe^JLGb_v`w_`!tE;PT=5o2`*=)9w$z*O}b0O4f@u8SXrIJ27JIfRbg~z2* z=}&s~CCRrW4O4JP*wuSP@+rxOB=3;S8pPng;AAAP0}RAv>Y(Zg}|ZK`;Pzv045btI#fel)c^nh07*qoM6N<$f*Qb; A(EtDd diff --git a/core/res/res/drawable-mdpi/btn_default_transparent_normal.9.png b/core/res/res/drawable-mdpi/btn_default_transparent_normal.9.png new file mode 100644 index 0000000000000000000000000000000000000000..3b3dea990f3bbe79d1df72a27ae5ad833f1ef948 GIT binary patch literal 1007 zcmVyy?XHGSMc6bul)eM_AB@mym{~>6yn($6k4GgTVfPMVoP3j$LGI&CQPTZ z&FrQvF8s;cKJ(lEGtaz5D5Zj|mk@%&l*kmLK@=QZ$EDjZTyjsH^nkQLs!V9_7wJ3c z3+dQ(LmKEI>B-jC*5jq6rBba{ljJx?%B-hFMr5bci4P7A2HV@)AL;A&q|ZL7gM;Tg zJ3DLDYBd^-Mg#gB0VJhN+Sjph90P_g!$P4@>UO)~=H})H`uv6+j#DQcZq_z7HXhB- z&quvpZ`kkm6~TfiiX^=XyqfRv8}7lqh(Rpc@JZcbyCdr8^r)+ zxKZb8At?sMAi=N*ZP??^38ECl3<6*b(m}f77#46*XlJnvN_9ja6hN$9u$hr^)>P_EfSm#&6zab$8d1k3`c6j0Jn#sJ1mMPE=KAl=@Cc~En7MG9X>5@|y} zc|dHM;4DZl5GoGJGOO$C(E#@c(ICY@Re6>Lj{CnrAx3y!5MsTHLC;%Lfczaz3G#Ln z^9aua65ft@&dTM8$J0eej;+)6q|UKF3weUPT1T!v($oGF`#AqTx(P=i&%*gEoyA=M z$rRAEm!BiOeCHu>oL@1dfzp<82gt7&^ft@UxZSd_p}cMOOC1(3$b_V%^4wqtj2AwC z5N+Dc{X*)Ju9tAVZ^#0YfRJ3looOJ~nj+EK?4AF}bPq)a#ZM8UDr?n@Ww z_~_`U(r7d~T!QBLNI4E-2?XaTB%$4IS6l~X7pQf3c-UB8UhZO{MdK#STI9wMKbqvM+1TITUznSl3uk9%<;={CfG90^4IqA>2>0M##2^-J_?*hiq?e=@>+9=Z zS5{WOt*)+i$xUolpDt&dhxYdNs;yS*-tO-1efsG&=@sdZIW?vIb8?sTjP#U*Q+8v* zq}?WcA~i{GNk8m4@Up*X;Oq|RHtE&`&|lJT(ogLq3+PJ!3zESNT_W#pC+l@%jxvMt d?kD~UFaXX|_^8#8m5u-a002ovPDHLkV1fk);`IOk literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/btn_lock_normal.9.png b/core/res/res/drawable-mdpi/btn_lock_normal.9.png deleted file mode 100644 index 6bdc2c64f19a6da99a7f4512438ef029a81208b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 982 zcmV;{11bE8P)ha1x5(g2<9( zMSzf@h$x{(O5+NNnvOPYs{DXd`3-c`NK|ejA*u-KAR&vwib%j66e0e&Tjm`zVY94# zbH+}?N>6)t-r2WrW@kSfS!+$z5=9Z2*{G6@5RtK2Mv?y08Eu+`M_k7x{pEx+!UwL^ ziXIT2?Cxu)vkx^E_fC$H&J%_xAQa)91H@PrjlMQH${O;NYO$Xf!5S zmW|P;5J@}O2@w=0Nm3gO2I=nZZjavI5WcuXA(uSd+1a^Uuh+Bl^Yh7gJT^oY0h7rj zruPDPmhWhTwy=RM`tUmq#pq76*-S4kE+#Y@jI>aK8nev{bU_4FsPQ{&(T9fU*82Lo z84iaCuwep2WQBWO*RlIhTM)s;utgslqJ&5?xC2V4gCcK)%$p1a36#;Z<(OsY!_T{E zM3#u)uAB+%lsvPZsu+Ym(NsksA>?Fu8IxJl8-)Cx^8`z@uFFTGkxXYRL?J~?WY~Q| zrXwPfF(GsF%b#(6LfSuzCJbs?MMJpG31-Q1X5AOHA|ztrI)CO&VYxC2a&aD72!ceE z^#*V!!YoA+Clt2R5phmfH($zj1E;N36Y=!6^XxxZNwh?Xuc%6?lCbdti2heaNV;4x z)n???---f9r{%aVa6U_TkFj$qsuUwLr{}~@7b70nT#9&=NYq5r7SV+hx$D;=h~g}zC`FJ(g#>ee+F~a%HRa7!Dt|UC4{d7btD=SuZSlL}m6kYDJu&orM zG)=AR!ZO#P1}epfNKCC(D@YWI+~cu + + + + + + + diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index 26b77bb70b24..f8944b5ca868 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -136,8 +136,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/screenLocked" - android:layout_marginTop="24dip" + android:layout_marginTop="8dip" + android:layout_marginLeft="24dip" android:drawableLeft="@drawable/ic_emergency" + style="@style/Widget.Button.Transparent" android:drawablePadding="8dip" /> diff --git a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml index 5c802352a6a8..22c0b8e2066f 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml @@ -128,8 +128,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/screenLocked" - android:layout_marginTop="24dip" + android:layout_marginTop="8dip" android:drawableLeft="@drawable/ic_emergency" + style="@style/Widget.Button.Transparent" android:drawablePadding="8dip" /> diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml index 6da82e9fa032..602a37ca9621 100644 --- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml @@ -155,10 +155,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/lockscreen_emergency_call" - android:textSize="14sp" - android:background="@drawable/btn_lock_normal" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorPrimary" + style="@style/Widget.Button.Transparent" android:drawableLeft="@drawable/ic_emergency" android:drawablePadding="8dip" /> @@ -174,20 +171,14 @@