From 79a02b15850347a2e932272b21b14c0c2b3faf50 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Fri, 29 Jul 2011 18:07:32 -0700 Subject: [PATCH] Fix 5044158: layout and asset work on lockscreen PIN mode Fix PIN entry layout issues on hdpi, large-mdpi and xhdpi devices where emergencyCallButton was partially off-screen. Copy button assets from latinIME for PIN screen. Make PIN keyboard horizontal and vertical gaps configurable. Change-Id: I415fcd83f02971b987c3df418d4114b8e1ab3945 --- .../widget/PasswordEntryKeyboardHelper.java | 4 +- .../btn_keyboard_key_dark_normal_holo.9.png | Bin 0 -> 435 bytes ...tn_keyboard_key_dark_normal_off_holo.9.png | Bin 0 -> 514 bytes ...btn_keyboard_key_dark_normal_on_holo.9.png | Bin 0 -> 585 bytes .../btn_keyboard_key_dark_pressed_holo.9.png | Bin 0 -> 553 bytes ...n_keyboard_key_dark_pressed_off_holo.9.png | Bin 0 -> 632 bytes ...tn_keyboard_key_dark_pressed_on_holo.9.png | Bin 0 -> 720 bytes .../btn_keyboard_key_light_normal_holo.9.png | Bin 0 -> 468 bytes .../btn_keyboard_key_light_pressed_holo.9.png | Bin 0 -> 547 bytes .../btn_keyboard_key_dark_normal_holo.9.png | Bin 0 -> 334 bytes ...tn_keyboard_key_dark_normal_off_holo.9.png | Bin 0 -> 373 bytes ...btn_keyboard_key_dark_normal_on_holo.9.png | Bin 0 -> 422 bytes .../btn_keyboard_key_dark_pressed_holo.9.png | Bin 0 -> 394 bytes ...n_keyboard_key_dark_pressed_off_holo.9.png | Bin 0 -> 449 bytes ...tn_keyboard_key_dark_pressed_on_holo.9.png | Bin 0 -> 499 bytes .../btn_keyboard_key_light_normal_holo.9.png | Bin 0 -> 332 bytes .../btn_keyboard_key_light_pressed_holo.9.png | Bin 0 -> 381 bytes .../btn_keyboard_key_dark_normal_holo.9.png | Bin 0 -> 568 bytes ...tn_keyboard_key_dark_normal_off_holo.9.png | Bin 0 -> 655 bytes ...btn_keyboard_key_dark_normal_on_holo.9.png | Bin 0 -> 775 bytes .../btn_keyboard_key_dark_pressed_holo.9.png | Bin 0 -> 737 bytes ...n_keyboard_key_dark_pressed_off_holo.9.png | Bin 0 -> 855 bytes ...tn_keyboard_key_dark_pressed_on_holo.9.png | Bin 0 -> 996 bytes .../btn_keyboard_key_light_normal_holo.9.png | Bin 0 -> 591 bytes .../btn_keyboard_key_light_pressed_holo.9.png | Bin 0 -> 668 bytes .../res/res/drawable/btn_keyboard_key_ics.xml | 42 +++++++++++++ .../keyguard_screen_password_landscape.xml | 57 ++++++++---------- .../keyguard_screen_password_portrait.xml | 22 +++---- core/res/res/values-land/dimens.xml | 2 +- core/res/res/values/dimens.xml | 11 +++- core/res/res/xml-land/password_kbd_qwerty.xml | 4 +- .../xml-land/password_kbd_qwerty_shifted.xml | 4 +- core/res/res/xml-mdpi/password_kbd_qwerty.xml | 4 +- .../xml-mdpi/password_kbd_qwerty_shifted.xml | 4 +- .../res/xml-xlarge/password_kbd_numeric.xml | 3 +- .../res/xml-xlarge/password_kbd_qwerty.xml | 4 +- .../password_kbd_qwerty_shifted.xml | 4 +- .../res/xml-xlarge/password_kbd_symbols.xml | 4 +- .../xml-xlarge/password_kbd_symbols_shift.xml | 4 +- core/res/res/xml/password_kbd_extension.xml | 4 +- core/res/res/xml/password_kbd_numeric.xml | 3 +- .../res/xml/password_kbd_popup_template.xml | 4 +- core/res/res/xml/password_kbd_qwerty.xml | 4 +- .../res/xml/password_kbd_qwerty_shifted.xml | 4 +- core/res/res/xml/password_kbd_symbols.xml | 4 +- .../res/xml/password_kbd_symbols_shift.xml | 4 +- 46 files changed, 123 insertions(+), 77 deletions(-) create mode 100644 core/res/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png create mode 100644 core/res/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png create mode 100644 core/res/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png create mode 100644 core/res/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png create mode 100644 core/res/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png create mode 100644 core/res/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png create mode 100644 core/res/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png create mode 100644 core/res/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png create mode 100644 core/res/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png create mode 100644 core/res/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png create mode 100644 core/res/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png create mode 100644 core/res/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png create mode 100644 core/res/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png create mode 100644 core/res/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png create mode 100644 core/res/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png create mode 100644 core/res/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png create mode 100644 core/res/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png create mode 100644 core/res/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_holo.9.png create mode 100644 core/res/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png create mode 100644 core/res/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png create mode 100644 core/res/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png create mode 100644 core/res/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png create mode 100644 core/res/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png create mode 100644 core/res/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png create mode 100644 core/res/res/drawable/btn_keyboard_key_ics.xml diff --git a/core/java/com/android/internal/widget/PasswordEntryKeyboardHelper.java b/core/java/com/android/internal/widget/PasswordEntryKeyboardHelper.java index fb33748ae2c81..366b983c39239 100644 --- a/core/java/com/android/internal/widget/PasswordEntryKeyboardHelper.java +++ b/core/java/com/android/internal/widget/PasswordEntryKeyboardHelper.java @@ -29,6 +29,7 @@ import android.util.Log; import android.view.KeyCharacterMap; import android.view.KeyEvent; import android.view.View; +import android.view.ViewGroup; import android.view.ViewRootImpl; import com.android.internal.R; @@ -62,7 +63,8 @@ public class PasswordEntryKeyboardHelper implements OnKeyboardActionListener { mContext = context; mTargetView = targetView; mKeyboardView = keyboardView; - if (useFullScreenWidth || mKeyboardView.getLayoutParams().width == -1) { + if (useFullScreenWidth + || mKeyboardView.getLayoutParams().width == ViewGroup.LayoutParams.MATCH_PARENT) { createKeyboards(); } else { createKeyboardsWithSpecificSize(mKeyboardView.getLayoutParams().width, diff --git a/core/res/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png b/core/res/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..5e6a9d6a478b7dff84c848c0f0a5378d823ba900 GIT binary patch literal 435 zcmV;k0ZjghP)z1|6seU8N`nt~vR zX0w^~Z~$Wr)9LgWXqCV!rl$4epK@0M96}C%_=DL7IH+oX8lVQK0crq;C9P=R00-6o z0?=B|j4|o1!i+KRzXAYrt@YEcDw)>$5y*@4YAa6q{r+7PMJ>e++X&C|e4M7~ z%Wycn2TEI5b^}7-42XgD3eP4IU<|wh&%k6I04z4+1GY-)oW+;t>x_Gs5)qUtEn?Rt d^*c;N_yFsifUJ3;6Wag)002ovPDHLkV1hQDzM=pC literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/core/res/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9d7406af7da280384c081375066f54ad6f420e GIT binary patch literal 514 zcmV+d0{#7oP)v00004b3#c}2nYxW zd&#a;zhA@ufTaule&3N&UNXi`h^SSW2xC4G-TJ2FMcs`$B zjmP8D>2wNXOjV8$LO7jH=ghWk1K>P9mhR-9=XtX*3}uyqA8^iLS=RG#I6MFlzL$x| zLyqHgm&@f=1OdPp1FiKwfOfpjQ=z>|t+EmE8=jS_6C64J{M%$_I$3)f$+Bo9%c7Ai zi$=06c1Ch#cV0JEcIH1JilViaA7_Qp#V?pIDPhsiiSy zQFs!*eradbH(`u5oRE z>u$H(wr%@R2;t_Lyog8^Q54Mu@mp6e1$L0yOBHUwvuuA^-pY07*qoM6N<$ Ef}D@h)c^nh literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/core/res/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..869a33080c62b61cf0c1c76495ea3fc73b3825c1 GIT binary patch literal 585 zcmV-P0=E5$P)v00004b3#c}2nYxW zdq$gGR9J=WmobYIK@@<$nb~BsuDK8n z^dCqHdl4)x0=D)x*9tcGBP^zIRGkcq?Zb&Yd zNIqEDee-tqn;B-Ahlo%T$z0c+GfOV-x99&r|4xlK7@j0qc!#&h5I9q=OCmY>N=tJNA#r_*4Qf|qEm z@jUNmx7)o7OfSNsvq@nXHj^Z|5kUaw9B~}ifm_+Q&LvegYE_KMKIo#XZ9-G>&wrEb z%uH@Qd&zaNms}Tn$#t=pTo*eb>9OE+z6?r%Hi93;hB@!fT5N^05U({8l$^SuAQebJ9%Yojs*1iq)%R+m3KS@1Nlo1V)G2#(G=n~{+? zwzdpz0JJgk>u*mldb|bpfOx8a+Kcs-?v)NuUg`To8!KAJAy5Z8Qw7NNFhKrmOXowf z@BMUW!UH0Jaw=d9HIn73QGy`O3NY=#6BW2EK~?-250La{aqEHE0$_ANJg5LS-1!9D zmEV<$oF;VVfyvOL31@UdH~jfc=xi(G?u6BvaID}D>VbdM)qO5kdl=by9{6*jxz@B>KP2k=VvHL5=P5A67$s59r`n3nVCL-Jbj^+0mAg&#V00000NkvXXu0mjfJoft4 literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/core/res/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..72d63da61debf0f84e617376ef00289d3b0bb2f7 GIT binary patch literal 632 zcmV-;0*C#HP)v00004b3#c}2nYxW zdRapy8Fe8p zR6+zn5edPSJ6D1WK@fcmUm$x0AHbJzaO>8kK0rngql*l93x>?KXR5o7i^-+Cr`uFC zGd)Ot=*_9qT_5M1zq$|+EG4OD+Bt{G_I#)MKcw=3$1mT6^;)>@IOwLggj_q5y?q~84?|6{X z-}M-DGuJB=sIZ<8F2yCUS?gpj7+*it*xss5eCpy#Pc5%@j`b~b)J*>PqGi}mSg5%u zdr;;1VhXD7dVwj5mr4YpuKqJ5Xj;t=a_Pn@L1>iYTI~>AUF!zdZuj!>QJlyyPVD$h zq8RlZ)oN}4nV0gAJ$ct?aPw}R3oBRT%wlM>LA3Y$lcMf`Z=0W``L+S{(@RA?Jqz3c zt^@UwoRgLSyTAtU9>~mb8Gr|bfIn5VtTf{a+RewjNr?z5>*T7hy^!j#i0~WbhX-xg S9(<1g00000x$iEP)v00004b3#c}2nYxW zdb4=icL@ zCYekoW@1UENGO8;US+50hsOBRg0!We`J*$7#hg$89!Fzw zNW1*KcEi^khQ>^b4*;OF=C3~+Dlc#gz*7KWBBXWt(vf;w*&vaL@0B*JROkXI0H}4j zqDdThHaPVbHW}^ii!!=2Fq6yxD09d@S=cQbbrKkyX(5wdK2XWurJMrH5G54IipRNA z&8#$}-Laf~VVpiC8z)PRgzUCDOVX6a$#y0Omkx~cS4wT147bVj#>v#;slPb;&p3U} z9d{;)7*c4mgeIci8I)NdG?KNE%sj^YjB0leFFmB2^Tb?Xy>QH_IC(n|o%OcLn{9vI z-)x>~d4aR16ZD=B7)7UU-MRYa#D#?~v+>x+^4aS0+r%-dRs+04( z?e+uLZ2Xw>>)xR-4I>*(2wH+FrBwhr8jF|9hMm8Si`O6G_`)eTGw!H|696eSNvVk< zGz@~)lC_rUHZ;HCVY9rB(#mt_@HKjW#1d_H7{E0E=K#zm{E$hA0aO930(b|Y9t{oy zumHFK?1`fFO95yh*6M#o#LS?6Cue=^1tJ}0X8ZywLp5P^iF6wP00009z1=HK#9@N*noAWkL-7)NFp6rxF6j^_XvdVwgmz|t@2a`$@gd+lBNiinUB zS-W<-F@5fw^eA^=GMSiCsdTH9ssn|L^2|i!Wjr1~mdjRC0k_AQ#95askbTuISJLM>kPsM+ zMlu)-ig6rgE)hkM>i7FaciioIPogNgs?}-)K`=AMh*IfXM1<*dTIhDWeyi2;d%fN( z5H6?h-PMgT=C0Xn)*Fq+XQfgJ$$;T-SZuf3ey7uUw$?rXvz6bb@&cd%Tmt8$KPAGV z%kHyi$*1d++ZOkLQ^2H5z9I&`0Q+0u!BHZDv(fh5r2Zrm5xxPwbbly0geVLE0000< KMNUMnLSTZx6UzSp literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png b/core/res/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..5612c51a12c554b94614fbb23985b18169280ae4 GIT binary patch literal 547 zcmV+;0^I$HP)~&v9tus);&u zU_>|ATb2%OhlnL0kU*w!Ts!f*9h@q* zV{k108{kOKlJC3DJwE5Y_hLkZf{@6__h9kb|4|$&8F>EgY;E0IJvNkjtwmPLC}Jq( zXpvKUW-;uS2IgU}!r$GSn;J2$-f4Xl*^)aQ$f~#hJng0>Pb3*8vOook{?I+?M>yIR^xw z6^)n+36cHJf~g;W^z8<9?S26@b|L_%t)Z>+oNLy!V{&!K3GP9hAoh0EeI(z zXo1MXrNLDo|Fi}3q^c}f4ApEwx&kUXA6n3$0@dyVS<5gyji|E+jM&}q%Ex!_5Ka7h zql6(Eyz%(&1YjaxZ!W}h5v`G#Accq4i02~1>rX%sEtu>9hl`INc)Dk?`DBL`tDB|j zQn(x0d>{1bpPv9R71GS^0lUC9(EUSB9tdCqm%wM>Hj4m+%5;Es!Qu~?5Wabkl~_BJ lh@ezVh^kMb`5#~r?g7{J0Y1cSzKZ|=002ovPDHLkV1jT(^rHX( literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png b/core/res/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..d449d760067d781bf9c5ec5153b475adfed41b17 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEX7WqAsj$Z!;#Vf4nJ zaCd?*qxs3xYk`6vJY5_^EPCHg@yC-VB&(=R4T(|=%Nxv1X z*q`6AJH6>r)b48zGjDFqjb^m)-M9YlU8WnozqjrcXK-g&&v4I_RadB!qvP45I_sAl c63;$MYHSO$ou*@#3G_RIr>mdKI;Vst0PeVjFaQ7m literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/core/res/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..80fe863f5f6c32237804225f14ba23809fc78711 GIT binary patch literal 373 zcmV-*0gC>KP)KmCI?wFc60S8Rg&y>%)?q zQi2;u11=#gY)zXka&`l$z&(U41mrcAgOMi(KXAgX^00hJ*dK(@%t)U!Ga!fv9Fk!y zwf9ap>z|0`i!96TMPzTS-TF9ODRp4xU7qKUgGuHCaLTC20$>{c;@7jyZmU%B*W3hYiP|^U4R$h9|qEwQ66>mlVA}+ zS(YDcNs@r*`*)sz#+cSxdsIqo&IL0w!Z4fwA_8W1eym;B>61VJjn?`hj^mwDDse$a z5fR$9Jqxqe>Z+>t0N$oOpJJ{7+zs>6+6sUJfF}U23(xw!NJQpEU+d=}ps)Em+h}QV T`j>EL00000NkvXXu0mjfbYGn= literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/core/res/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..196d6d9bda61fa9366eca158f4b9fbaf6aeadde8 GIT binary patch literal 422 zcmV;X0a^ZuP)Kl~GQEKoExi*@2c)Yigr0 z#v}9sUVwN4uh47w<_(${PvJ8c@C4kz2h$o8Qo@p!WqhD*kRY}e9yI+Evg`~y-|p-# z0}(-uWc?g!&z<$GeAZp`uU3Z|hZVU$Gha`^U3jof>rV36~IjR|LGpSH>jN4F~t2zRYz&{GK zQ2L+Ni7i2Ikb$lI>Y9|G7YZibIRvbIW_NbA#O-7TwsT;*B=}F4cz^Be57b((j4=yl z9(?yP5uwv1*xkIpBnA3mQ?e`zzr-lK+r#1Tq2KRMnEAA7Fx!IONhzff!>p=d#+WdQ zqG=e0_W)9q$`b&b1GrhYyKhXj1i&1?3xJOUWBpzvA|To>rmf0BKwcj|0gx1T5&8*O QG5`Po07*qoM6N<$g1=&~u>b%7 literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png b/core/res/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..8f340d3551de82288633d23f364e0005704f7ad5 GIT binary patch literal 394 zcmV;50d@X~P)zl)FmAKoo|*$wqgBm$k69 zva+}E5ws9|58ps-d40AajGynN# zkVJ)0+J4_ujrmW)%ntTWE_Np3IG)&k707(Y89Iie)BWwMbV}~bdguP>^>FwR&j|(9 zPG`C+o_hdX0~R0yyK5VZZ=+}-e}{4*#Na*b13e(ffi;euq?$Fz0ErW_WS7J~1_{YF z0NdQq&82fWL|(9 oU{Errei%s@Gc`t29whJK6HOzIFFETn9RL6T07*qoM6N<$f{3f58vp4mcL5FP!z_0H-Bu4T9vvw zh?BTFI6CSe_#VE2y7&;jhl{8nf|KB+gQGaOscoUOwINMDht#x@G(*#7@IVOn9PasX zzw=!ZB#{vsJbCj`F`M;I!i+8s&#(6bapni%(lnaS*;dmsoL(I5-40T6M(XzS``1bH z+joV!(*PPwX}RJY19w0O5CfgH&4qf$n@^rOUkK4?_m+S%&`ki<_pQi9QzQaJ&WxKn zL^d`^NZ|~CVPfedYEs56niQC9IFytbUCePnB*IWrSCnuZkb+MbNm`_7RIq74g-IG~ zs3J`heaNyURo}CCxv#}@v22;G-8#0LwJROS$6H_BmPe&p8n@MQT)EYiK4vI`Z#xRJ zM$u{Y(t*&^)6Eqd+Xqw@%W2vMKu}w6Cz7qYn@$pRTRmPMF9Gj2`?u>Vurqk)ou+_K r-~njl>@|59NtoeGX7!h2AiC#260fLQ_@8F900000NkvXXu0mjf4^zSb literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/core/res/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..02f4b3de941cf8680a70a20dde190a5e6f2b081b GIT binary patch literal 499 zcmV4mAy&>K@^3**_}0sCYr)Z z5CjXcw-EFJv=HnCU%)qrHn#S@fM6?@7GfnRcD8~jvGXTFqML-Boolfn$*Q|T{t7P) z%bmOToSif0vWN&NA+6Q#epF27`X`~flg-1k^-$OkLOV4G@G;kUcNBZ4J8S2yEzwpSiyfgvv)_3djO}j8IJAL@pX2 zBS7TLHmD}Du|fn9I|M=-OLeR!k}^fT62<{Lk}{;hOd>=CYh~byVv`6N@d+bIM`;=v zv1vd?CTUwk`NK5YHEJ?f(^>}#ATXZP>IGv$o&2Rqrip%J>5|SA%h|2fqdC_x4uA$%1$jDNV=H44ClT55hi3_@*xyo`WfZE$~c!rk=&U;z1!It?thp8d{;058B5 pQ0Wt^_fR5&QXQiXiwB}P{{p5Uybf8KWkUb}002ovPDHLkV1m;+&$$2q literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png b/core/res/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..976083fdf9090ad4a0a8e9bbd31bcc67cf1f6ad8 GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEX7WqAsj$Z!;#Vf4nJ zaCd?*qxs3xYk`9AJY5_^EPCHg+30uJK%i~E_ePhO5zEeayi_*$pitRk6E?4TXk<4|6~*2?J=K$)gY90hn%c%L}>W(65|$z zz)a(`nE4{9$DQ>aaQ~Q-U@0|~V_wO*`Vyw?xzc;Sn;*U$vqXUD-tW>k-Syj@Lqlh8 z(%J4BSkrN4^@N!hP0lV`_qzN+@t6PS_OZTeugrVPTfzG6!0j`0N;+o>%KpCcj`Poy a=h9D@g4BO$OqmAsIfJLGpUXO@geCynfQ8=x literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png b/core/res/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..c39dd4a94c52fb454d3c37c12ba097cea704c472 GIT binary patch literal 381 zcmV-@0fPRCP)*l{-$uKoEw%u?|IW_Z zs45;(+kU^vkNHO=)z040`N334#?x8s16d1$Q78;94);%ONTbSlc=Pa-yp)sJH%B7U z>#j$~z!@+DaNw}N-F?pA}M{P);3_<+-2|E2{qQwq>eb`va=#tpqKz=ddSwTM4LP)6fQ;%4jF(MeC*) zt(#u7ZhFzW=|$_N7p0vD=!u9R(rjV)+deYJoNqRp4?wk>=j}a}>-GBFT00Su z;~)s8gTY|hq^PxaX{}wRY5LI^^A#woG1sN)E^r@s4jcp1f5hGt1(v{X;4|<8NUK5D z^_fz3Z#85mc|^0K7wlxe<5~8eCJW<|QXToHO zG(wscLPBDNgysa9LF)1%jF5CyE~5Kc&_U{?RLAb znfV&PCp#ujj3$%GJ7dhF`Fvj4OD7Sb-|xRrN?ibW2J04)C)NqW@S%uQRti|%tD-0Z z5nTe%0M@ouM$GfPVUi^GPBp(_0BC_}MRRze* zIV08-6tWMTjiAvPYb32$-Dt(?Mk`h~TCuv(iq(x)tZp<~td75!x6;^*9j$ONsnA)QZ%$3UZ0}ayye*t}qM}V@z~tu~cilv7Lwx&X$P47_-Q0%gdNy z=3iRti?S<9M9^AeI2;ycMMR*K0yCF7#@{iR`6qG;Qnr`?2z}pw-|O{Wx~}_#h)Qjl zT_$Xd*?U}IC3IKfzF9059{|{ITXHj&20?Jc%zYv{S4s`E)`LIfD5fu(Ns{51g)!5`aj);ROL01N;C002ovPDHLkV1l$)9mfCw literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/core/res/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..2f4de8ee74eef658687306d831f38b41560bfa2c GIT binary patch literal 775 zcmV+i1Ni)jP)#O;OEa0&rcFu` z=7E8k+;eB{dq2($?~SM`BEpnt;rf3!n0NeWWi3{(sHm7VrHgWRcefb?!A=kaZ-6aT ztzUDy&P7D}BJv|m(`QMNeA(OEO9~+Z0|AWy1U@if*gw!is|7 zyDE-jL}Uvvz{s>36V_}tH_|k{aa|3(3R#w+s%@YF9G@-o3bCSEzU~&BqK@$&RCVg_ zs|8@J&11q=1&{F$&Xr)LM{Fgjge@DDuw|nXwro_wmW@i-vQY_JHda=c&yu=bVso&mFz6X=U-9z_#l)Cu1|I+Ff;oQbjI5k*nz zoQtn&mdXXv()9a{qo^v*xj|W3*@!u7?O$We<|TGI0mxG!3JpK^8w7R5U(>PjH1dc- zL!MqZ%Rd&}#yWM`-Xf&SIYPI_!GWAxj@lTS6!w(eW7uHxV?+iU@&+WhT&`A?7S~^eY1YQzi+K=iO9O=c^zX+XPO6F2a+jSGMtjdj!^}5 zV68<}rZxbrwOwm%x7X`^h~xMhkQHMlb=6Ja7Vr>Q2Ri4(UN;JKfkWUk@EhnAgC=Fg z9>ZSn8H#GNSi+7Oiu(l=H~lJ>5}EJ^mSywvM+B%U{{Xjy9~E%)z^woP002ovPDHLk FV1m*dWM}{Y literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png b/core/res/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..3871689ef23cc70d5b6faeb5b3d3caa6c8791d98 GIT binary patch literal 737 zcmV<70v`Q|P)c#gMl%#X$@hZxG~qf7h?g`FWDYJNt%R+%v$3J0{IjQ zif789HzttL8jmR1WUYE+O!c6)Vy;IVku@d?;?Yt2jZ3+Zb3Mkr;?~yCi;RC}T~Tsk z=!;Z95K;K9sH3QG^jzL|PlrhzJ>)x6ax$uttt?dhI$E{uusAA*dFrK@Dh#S<_=4c4 znAFtm$&;fKhdwvoS1Fw$^mq#W^pi>b=aY$1e)^hBllReaLRXcaV@%OU$17Y(IUOP_ zZs$*BY^NM!>bIwhFzXpP>S=R#adLFxKDx81C5ba?jfgOst=ueC3=XvIlx@#sIN0lw zYK4*Vw_{g_5lDvtai@dD*P^2W^yTyVI!m|jb8B^puqK3&+iyFW4oG#t_O~BwZM+4N ze+dQ9{QkN@a?mDF^EBp~G_SUt3LW(N40kCi{e^qT?0~Ue1zydIT0{5&C zpac8?-T~V{w@9k0`Y!oXMdTvexD~ojF7_9euwTLjl!%~IdEEODa|Fi(i3ooIdD%ci T(ah8y00000NkvXXu0mjfefv*& literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/core/res/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..836ea6e789cf609906c58b94d4fe478d0907d7a5 GIT binary patch literal 855 zcmV-d1E~CoP)A$La-q*L!AGIPT>clzLeY4Y6|Jh;5+pIKw(`*Oz zDa1Q83a%r?yt7@*xletSH^AqpO&l>fI5~aMR@pkPHX6pvX6dvo;o4IEfsMHeJR#B| z;)ppVuXQ~@j4@^^L5_mJDCK&~SZdY*8))~g_Yrfp?ygpvzKe)S*%zk{ujLy|PyiNz z)84fxG0}F@Ms?OXb)XPV8CGVh2 zK>Kntw9O2wL;+$`QMLOq>lH)?ref3-P*jBs?an<ELY|By%M>_G4A+MH0U0mF(4q8QY|H4jf<#SwvJt+hVEm>2fjAF05|7g zJ0ri=a$OAu?v7wPu9|UnFlY;nnjg0mr9Xk}r7<3JgJ;<6V=s%H8{TI3w1-f+1P_*a}w@6SVXyl@X0XH@& zQ6%rj>p&}!DAEyWTNMF+g8<>)k?-U8-Fv5_h?zk|s0hw|f8PZzI(~98=cixd5|=n{ z6fVlUPkv~(eSfFrtH%JYS!RFEd7TPLVn~F);zWPlkD}kcdvGVsg|I4`IMi;(u)g0r zimru;c8RgWIpjMt+Mc5BlDg4tdG|Eaw*Y?0#}pBxSBJqP!*uBxWfCOO1$ES#?>)Y#LqCF6~ihXhJ zh*Is~Y#YEbfM9$qPmI_k63mOv=>!a9y9|*ZnYN;Hf=}i&2vaf?Rz>hAv;pi&_Js;# zG)938ZUm}~vo zWpchKTP)MWxLJyo9Rn07#&6eIBZ^0f03{8Y!DvSDpvvXGA&Sjx#Z27AS1LmdE21G* ztiJQ0W>|6dK6bLcnzHkly^oC+WLddcFjVMcqZt>K%6yAYu?PDPc$u zXU8WK*B5Y1FitTuac28EsJy#Bn_x;<@|32vct>=Ph)o9~ETUGmZ z71r2^VrM9bopvZUTKlapw!hz!q=k}Z;s>p<${E*kKR)~NpMT@c7?Usg$qcV{eh zU=1N2=%S$_#T*7lAvzlyAjzoywiBuLT{!HT=X)OqzLyFwx5l*bIMKch8x8xOTN-#Z6#2iG9(L%hc=!I23?yP z&lxMLQL|dWXo39~FVWlm3BBEK0F1vlDSX?a@%JCQNCsU9T1Bg~gr${srTYSi1(OLJ zhzNv9OEU<}j*RUqb~Sbaaes)oAK}lRf5l<%cK}m%Ec4kKfGq&G0jvX9JtcPDU;xJe z-T-(CU>`u34=SsQA+o2Skdf+Qv4{o8$n610{@-*iaXz4uKd>}y3p_!9neiV%C8^$J SqEvhU0000M zw1P*NS$E$z;JtVeo}nv*)CCf(V2h9{5gJNTMu_P+$>}1~MIED7Z4491pOj5}`(pbz z@&Pl$0<1m%*O?thhoe-4>E(XEe^#&8-xJYC0IvXemOT;xu~O<&9LGVs-A=V~CQ~aZ zWe315@`(NV*pW>Lz?BfLqz^#gL9n?f`}T&lF8z)*ePPA;CXxTW?vZ<7)@oxXr zsML&Bf`aI;o8YBxp{K?zh=yUvi^ZZA$FVWpW0NR~Xg;6UOl78}&!*F9ZL`_L7Nknfuoz6qI+buLKlhtZfTd&vtXf#q`7={3pUgy*_y$0|O zzy|==$aAE&wgCh94j=;X8F?n}POo$-VD6BA6(N^=3A>_u002ovPDHLkV1i?w1p5F0 literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png b/core/res/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..c23a4b22578d047b6f083ea584d5b1c7468c66ae GIT binary patch literal 668 zcmV;N0%QG&P)h8IiNyaE{ z1TO>^q6lsjByZr#Jc$eSF$57`z$b9yO3Qf$YGzIzbIn=kHf^bHdUYzt$Zt!vQ_cEadNudhjT>XIkTn%`>GYuA?>!M#DI z9s;jT8yiveZLj+z74Pz&UQ9Np%HSzD-D=+P$<6^cG0K{aXb{Hwf&keZ>sKbQ-%n5? zYk&{v5mM#?|I&?9QKCvzQ1y9}J^Yb*=1kG`*+3x- zIhOY8Dkx;ldZ0XxWA+V(Q)<+<%qGCTcOe#L)9=h4R@VzsqU(>VC@hAex#ufI{~4AT zl}gcRu)tZrD0Q^T`YEx%F$$HU$HM=h=x8@BM-?sMC^DgOp1g4Guhp6`-X5oroZbYPpZWqn4}{f*Yedt;|VARRyy{=y=y zsi**vynpqS^H(=GbMYE}4SXMWVIYv|eC&SS;`@hZfO(r|&H4df-)#|hmr>p-jaHk+ zQri*B9PxgKey_u)&6n(cc?%3olW{Vg1kM7tfK{M9!FE~*&;j;?2}2!8?lg%O*1sjct;0000 + + + + + + + + + + + + + + + + + + + + + diff --git a/core/res/res/layout/keyguard_screen_password_landscape.xml b/core/res/res/layout/keyguard_screen_password_landscape.xml index 960907d439664..c2536b7cbfb0a 100644 --- a/core/res/res/layout/keyguard_screen_password_landscape.xml +++ b/core/res/res/layout/keyguard_screen_password_landscape.xml @@ -118,41 +118,36 @@ /> - + - - - - - - - + + - - - - + android:textColor="#ffffffff" + android:imeOptions="actionDone"/> @@ -139,7 +140,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dip" - android:layout_marginRight="16dip" android:layout_gravity="center_horizontal" android:drawableLeft="@*android:drawable/lockscreen_emergency_button" style="?android:attr/buttonBarButtonStyle" @@ -153,7 +153,7 @@ layout="@layout/keyguard_transport_control" android:layout_row="0" android:layout_column="0" - android:layout_rowSpan="4" + android:layout_rowSpan="3" android:layout_columnSpan="1" android:layout_gravity="fill" /> diff --git a/core/res/res/values-land/dimens.xml b/core/res/res/values-land/dimens.xml index 388eb38000028..02bb3c82c4370 100644 --- a/core/res/res/values-land/dimens.xml +++ b/core/res/res/values-land/dimens.xml @@ -22,7 +22,7 @@ 47dip - 60dip + 50dip 2dip 72dp diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index b3e50ea9aa70c..e534e9baa040e 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -50,12 +50,17 @@ 52dp 800dp - + + 56dip - + 56dip - + 4dip + + 3dip + + 9dip 135dip diff --git a/core/res/res/xml-land/password_kbd_qwerty.xml b/core/res/res/xml-land/password_kbd_qwerty.xml index fd8bd4907ed04..988f9ffa63945 100755 --- a/core/res/res/xml-land/password_kbd_qwerty.xml +++ b/core/res/res/xml-land/password_kbd_qwerty.xml @@ -20,8 +20,8 @@ diff --git a/core/res/res/xml-land/password_kbd_qwerty_shifted.xml b/core/res/res/xml-land/password_kbd_qwerty_shifted.xml index 9ff6fd7b2cccb..4941946d27d11 100755 --- a/core/res/res/xml-land/password_kbd_qwerty_shifted.xml +++ b/core/res/res/xml-land/password_kbd_qwerty_shifted.xml @@ -20,8 +20,8 @@ diff --git a/core/res/res/xml-mdpi/password_kbd_qwerty.xml b/core/res/res/xml-mdpi/password_kbd_qwerty.xml index 82a7c756152fd..265d7dcb49f94 100755 --- a/core/res/res/xml-mdpi/password_kbd_qwerty.xml +++ b/core/res/res/xml-mdpi/password_kbd_qwerty.xml @@ -20,8 +20,8 @@ diff --git a/core/res/res/xml-mdpi/password_kbd_qwerty_shifted.xml b/core/res/res/xml-mdpi/password_kbd_qwerty_shifted.xml index 9fff3ccf56351..7379f6916a3fe 100755 --- a/core/res/res/xml-mdpi/password_kbd_qwerty_shifted.xml +++ b/core/res/res/xml-mdpi/password_kbd_qwerty_shifted.xml @@ -20,8 +20,8 @@ diff --git a/core/res/res/xml-xlarge/password_kbd_numeric.xml b/core/res/res/xml-xlarge/password_kbd_numeric.xml index 0253122283185..3745672a58085 100755 --- a/core/res/res/xml-xlarge/password_kbd_numeric.xml +++ b/core/res/res/xml-xlarge/password_kbd_numeric.xml @@ -19,7 +19,8 @@ --> diff --git a/core/res/res/xml-xlarge/password_kbd_qwerty.xml b/core/res/res/xml-xlarge/password_kbd_qwerty.xml index 1009c9afbe32f..76b60195f40b1 100755 --- a/core/res/res/xml-xlarge/password_kbd_qwerty.xml +++ b/core/res/res/xml-xlarge/password_kbd_qwerty.xml @@ -22,8 +22,8 @@ android:keyWidth="8.272%p" keyboardHeight="@dimen/password_keyboard_height" android:keyHeight="@dimen/password_keyboard_key_height_alpha" - android:horizontalGap="0px" - android:verticalGap="0px"> + android:horizontalGap="@dimen/password_keyboard_horizontalGap" + android:verticalGap="@dimen/password_keyboard_verticalGap"> + android:horizontalGap="@dimen/password_keyboard_horizontalGap" + android:verticalGap="@dimen/password_keyboard_verticalGap"> + android:horizontalGap="@dimen/password_keyboard_horizontalGap" + android:verticalGap="@dimen/password_keyboard_verticalGap"> diff --git a/core/res/res/xml/password_kbd_numeric.xml b/core/res/res/xml/password_kbd_numeric.xml index 2270b8abdac34..2fd5aa0c7b621 100755 --- a/core/res/res/xml/password_kbd_numeric.xml +++ b/core/res/res/xml/password_kbd_numeric.xml @@ -19,7 +19,8 @@ --> diff --git a/core/res/res/xml/password_kbd_popup_template.xml b/core/res/res/xml/password_kbd_popup_template.xml index 9b853e26784ba..9fcac2ca88d6c 100644 --- a/core/res/res/xml/password_kbd_popup_template.xml +++ b/core/res/res/xml/password_kbd_popup_template.xml @@ -20,8 +20,8 @@ diff --git a/core/res/res/xml/password_kbd_qwerty.xml b/core/res/res/xml/password_kbd_qwerty.xml index 0a35040aa8451..dfe581ee3c283 100755 --- a/core/res/res/xml/password_kbd_qwerty.xml +++ b/core/res/res/xml/password_kbd_qwerty.xml @@ -20,8 +20,8 @@ diff --git a/core/res/res/xml/password_kbd_qwerty_shifted.xml b/core/res/res/xml/password_kbd_qwerty_shifted.xml index 9e9db818ba450..1366c584e6ed4 100755 --- a/core/res/res/xml/password_kbd_qwerty_shifted.xml +++ b/core/res/res/xml/password_kbd_qwerty_shifted.xml @@ -20,8 +20,8 @@ diff --git a/core/res/res/xml/password_kbd_symbols.xml b/core/res/res/xml/password_kbd_symbols.xml index 9a94930bbcd20..5876b0dbce6b5 100755 --- a/core/res/res/xml/password_kbd_symbols.xml +++ b/core/res/res/xml/password_kbd_symbols.xml @@ -20,8 +20,8 @@ diff --git a/core/res/res/xml/password_kbd_symbols_shift.xml b/core/res/res/xml/password_kbd_symbols_shift.xml index a972eb29f33f3..ee83544a4e3d1 100755 --- a/core/res/res/xml/password_kbd_symbols_shift.xml +++ b/core/res/res/xml/password_kbd_symbols_shift.xml @@ -20,8 +20,8 @@