From 92be52c3ede2c9f820a7fcaafa78949752f8d7c9 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Mon, 24 Jan 2011 19:53:32 -0800 Subject: [PATCH] Fix 3381660: Make modifier keys in PasswordUnlock match IME Fixed modifier key assets to match Latin IME. Added background to alphanumeric keyboard. Added 25% alpha background to numeric keyboard. Change-Id: I043171a5dec7eeb0c136bb7450fd4023208639dc --- .../password_keyboard_background_holo.9.png | Bin 0 -> 1108 bytes .../sym_keyboard_delete_holo.png | Bin 0 -> 1419 bytes .../sym_keyboard_shift.png | Bin 0 -> 1683 bytes .../sym_keyboard_shift_locked.png | Bin 0 -> 1480 bytes .../keyguard_screen_password_landscape.xml | 5 +- .../keyguard_screen_password_portrait.xml | 13 +++- .../res/xml-xlarge/password_kbd_numeric.xml | 59 ++++++++++++++++++ .../res/xml-xlarge/password_kbd_qwerty.xml | 10 +-- .../password_kbd_qwerty_shifted.xml | 10 +-- .../res/xml-xlarge/password_kbd_symbols.xml | 8 +-- .../xml-xlarge/password_kbd_symbols_shift.xml | 8 +-- 11 files changed, 81 insertions(+), 32 deletions(-) create mode 100644 core/res/res/drawable-mdpi/password_keyboard_background_holo.9.png create mode 100644 core/res/res/drawable-xlarge-mdpi/sym_keyboard_delete_holo.png create mode 100644 core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift.png create mode 100644 core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift_locked.png create mode 100755 core/res/res/xml-xlarge/password_kbd_numeric.xml diff --git a/core/res/res/drawable-mdpi/password_keyboard_background_holo.9.png b/core/res/res/drawable-mdpi/password_keyboard_background_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..c56c704bb70a493e02d8a2aa7fcc84ec983d8f14 GIT binary patch literal 1108 zcmbVLPiPcZ7#|yy5)DepC4%srKqIBQ^WN-i<_{TlGqYP4+;p>9Nc5D+%-dw#%)D{t z#hrxGh7hopf`6*eo&-JU#Xx(kP_;$Hiw6}C3T;TBP@A+D!GnkRCfSWWgd94T_kC}^ z-|zQ*-}}CE<$=#S+V{6}9M@4iW>(nQ#&J7pAMRq-%^Fx@M;FbH&>>Qz4J*W4&LLwM z6g_JkSFq(wpMHe<7^vn}N9aiDxMmYCZ6z`3*b5k%zN=+jn^2 zIyyg`Ex}S?;0gEGOo)eO2CDW<-Bum`$YIbIYmC6d)B>?L=|@_u^Xt4Cvy*Fq2kRlU zuJap7jg-p3ARz|XG)&pB7lK}tMj1(#(ATfnxEhB0Wg679Fwa}?)6|>OP zVxG=VP#S20&}cN$jZB(^;{sAuHQ^A&6pKhj(>}H0lpl4s7)%`5p&L+__#k1l#>f=a zd6wx$30_btZ4&!Yvr(*NLTm*BN<+c(lDgKTBU-`l)7UaPs!j)3sNjf9g*JPST6YV~ zdbhn$63DXAJ`Y{?DAuG&>?sfXv}o!)`;&HDM-yck<}zwdLSm*@L9Beq$mLWODg~s< z5^8a5g)J1axm&9+nA88#_ICZKiFE$ z7tLHXezEfXVEZiCXWnX~=l}WY?(oS)GP=4l|MuXwV72ezzTM@=r+zzm_NP^E>7zyo z-S50UceY-ZUabv&Is46U*W%R+hi*J7|8-(-&)}~|*NlrVAAC$ME$HX}Yz+KpUirDM z$NAsCn7jNpZ!cdy^z{#KdfKmCxc8*v^|iyD2R_)tJ-coE^8AyX-z9rq%nz6g{iAd5 E0Dw1YMF0Q* literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-xlarge-mdpi/sym_keyboard_delete_holo.png b/core/res/res/drawable-xlarge-mdpi/sym_keyboard_delete_holo.png new file mode 100644 index 0000000000000000000000000000000000000000..1555791691aaf1572667793df8a8a9c141225b07 GIT binary patch literal 1419 zcmeAS@N?(olHy`uVBq!ia0vp^W8U}fi7AzZCsS=07?{&CLn2Bde0{8v^K0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWfo`&anSp|tp`M|! ziMhGCj)IYap@F`Ek-njkuA#Y=v5}R5fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HT7t|lGSUUA&@HaaD@m--%_~-hnc$LIoLrPyP?DLSrvNfBF)6>a z#8wIDQivCF3w(Xy2Imz+0}2>q`W1-<`i6Q2`nkCve}PpOmjtCEoPkw!aY$uBs(w&v zaeir0GB7^Ulwq2IVTa!$kV2qqto(~IfsvA!^S4a{5&&77PpKu$0; zv@kbxb2W5xax^e^va~RERf6hGAt%iAfsWA!B@U#-0uutJKoAq2^no0B=1I*1=9nU2 z)+lkCeTad9akr<7V@SoVH#h9P4?9S(eK7eqljSS7#jaf%B?X$7PF`I9P=!@6uwOZ`|MrxJ~o)M>A>&q zwN4U=ErM>SMB06~37jcszC3+Uv-^blC2gU!fXSOmZ}Pm`t1-jvta9{;9n4p_F1f`` ze7}R)-FT7Mgxu40T)F#Lv%I!lWm%#Bq{?BwxyN#!hz_IskuGM!cUIOu5wLu<`M-#z z!>rVUi&lJX>Aycoro2_=f0Na8yVt1)Ojfn!ERhHfElt;-DE#w}&qAq7>n~THS+Fd% zZ`Dc9A7cB9yWgCgG23ZmU1x92O5M(y(&$4apkG4e-0tlD$(>bXnv zl)`^*JX3Uk>eJJ*n`ST6d2P5=COBZu!7~hhPIMTrm?jmxx|XZ!^Qs%&4`yi==(c99 zFkHI&sjJ|QB}W||zYBiwXU3#;g*)|6Ueas&YE{U0({sa*TE{e_H`}$oo2{;vp7Z(Y z-m`m_$e(79ur2p00i_>zopr E02s3Y2><{9 literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift.png b/core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift.png new file mode 100644 index 0000000000000000000000000000000000000000..91d6e32f9d0e3158acccdf3de98d70c66dc9c79c GIT binary patch literal 1683 zcmbVNX;2eq7>)Vas1JpZ}+?2=XvkhFO!xm zB>T_sCy_{G`65X&F|&y`)^`%|rQVdEAf_-}s>D;!Oxy;W5t2}YW*~sv2y2mK1lHtc zpG9IxqzRe&R3)xdB=FU!kp_EYXm%q;pb4^gI|i!_2o7W*TD?g?=|9m-0rVOHB|Sy~ zDljpk(=W<1BPn@HQq_3|HBUo{j{{=ue1gD;;4ok}W|=H}yMQvv%O}>JV>$&G6~PSx z%4?&PiX=dcnh_v|22#}^8wA)84Pvr598NUA03nbLGUyP43UT;M1|I~0v4=uvGix&W z$r9O^E@CI3=x`k4)9E&wjb>xgP_vc}@pwEB2ZKQ+B&e2L6As&{CQG=NL4sJ+W<7@M zQ4`={gfmbpE}#&WzIMTgDHLyrO_s4h5h0`7VT=yZK)TWB@oQAtf+r*YnDJI=OKL8L z(324hYBj5gd}M}u!9?udt;i!tSi?^=>xrbmSrSxjH6kWlE)h_O8=6M1;WIcKP{`y7 zSrCKC=0b$~EU{3?l9!zMN2)vG7;j$xs9V)xM`1UVuemno%;VKx6JW^}?B zx~Dk)RV>~kq5?h3H>FQ(-ZT$lB09!Qw8qL;vb`kI_*S_@m}8SB$cr9c{GVnD#@yG5$VG}Qj?muO_oxPlO-`Snhnm>S;ZnirgYVSEJ8ptIPe$L9Bx4$Z17ghGpDD{ty zRn(q~8dof8b)h|^#pi-D!z-OHB#+5LAn`*7H)h}4qc!QFAz=M}jv&n8(q(7?Q( zFI=z1Z@QqAG_L)wKMV7{-yH4@M` z;Q_d`FSyz<!`s?wi zEp8vDrtlC(R%||g&=o1F^NVzxUOJ-fIYQdgZ7;3D=1$mtXGVF5k-m3IZ0EzlwdR}% z=jPeZ7`q(U@)92!_3EZIjX{p0<5yfC4G({~z3{sG<664AL08fBRQ5Zw{^H4YWt(f4 z?$`oDpOI8<({NJ zCU^CbAE#Zqmm6Q7E{jWi@-?@=qrRamW5;ymL;qXcwzQ(`=z;km-AA^DS?)A$pL*^f zwJ1OR^B=HT4sv(~g@V_Hq*cT*) X)b1#FPX#t(G zO_se7UL1;>V0haI6WHd5C9*kLvdH3FtRK+fU~v&wL>Wi~7bQMrl+Ei>UJmzFMPvT8WGpvGKit*Nk*HZ=W3B+aLU1P+>~5TB#c=~ntw=nAhA?t{k| zima&c6)N<;Q$?mcM9XqCA`{~xD=xPBDnSq_hy({XhD$IY5dlIel_+r>S-ntb zjkDR67M)?$7L-(IInTS480PhQ#a^kH<;pNXl4OuWA`w9ik-OT-Q$CT?9Uo%Q(QYfp zxOj$jB0)x~l=bi`6nc6;1c%FHS|fJ4R}%$OhWRKL2E;h#a0KI8(RT9|`hgqkYP$=o zT{LE)-K>YR!g|=_LtvP@M;i(%LT{A090Q9&Rq9x)$3Z)JqfUjwFJc>GQ%VQ|S4&BC zDv(I!3IM}T)vDDbi7O0%BvL_$V?8X;DM*c!)Z=o63;;c@A@zhF5L&{Z&;vloLs+BJ z%~MV*9kR3Jz;Cgos5Z+mM*>6xyP-FMY*#MW+4Xx%ef^YrpNYR!dHs!!f`J^oLMbmzrJ z(mnNaJ#}ZMJE<(!^!cWo2X}J#)KuiIFC+W({qOEKZnhM8&W*;WEp#_~Gw#I=^iLnn zA9rN5H&4tB#7$01T%uP}V}8O;_U;Ho2S%f3vp(uc@SpAfs;wfUy=5wE=h8RLL(NrZ z1$NEfZ{J;RookvMKXhAota}m!VkSNI<)Q7;z1ipF!XHOY&R;ySm_K;1=6A_~YkAG5 zE;oG|`I{$y;&y$(@ju3%SH(r0KEGpHM&7i54B3;LI*k9ujt9CwGt>^CBRPGUe&lwM zu>5einLc#Xyyc0WxbOYXc3s}POVJvZ++Ul!4P;Jlx$*LzTmA#G$NGx>Klt<68MV62BRFJ4Q!cWg2H>&Vj$e@?^%&|iy}!|yeG`@!LT zC3EybOX>@EBCYm?_K1}0Z{`e{RV#x%A#JBqJX2ke#2)X?UFPI%K literal 0 HcmV?d00001 diff --git a/core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml b/core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml index c1149e349f8a8..16bfc3123d2af 100644 --- a/core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml +++ b/core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml @@ -69,7 +69,7 @@ diff --git a/core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml b/core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml index e4a1b81e131dc..b87b51fda6b16 100644 --- a/core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml +++ b/core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml @@ -61,19 +61,28 @@ android:textColor="#ffffffff" /> + + + diff --git a/core/res/res/xml-xlarge/password_kbd_numeric.xml b/core/res/res/xml-xlarge/password_kbd_numeric.xml new file mode 100755 index 0000000000000..0253122283185 --- /dev/null +++ b/core/res/res/xml-xlarge/password_kbd_numeric.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/res/res/xml-xlarge/password_kbd_qwerty.xml b/core/res/res/xml-xlarge/password_kbd_qwerty.xml index fd1d5f19a2700..1009c9afbe32f 100755 --- a/core/res/res/xml-xlarge/password_kbd_qwerty.xml +++ b/core/res/res/xml-xlarge/password_kbd_qwerty.xml @@ -38,10 +38,9 @@ - @@ -62,7 +61,6 @@ @@ -72,7 +70,6 @@ android:keyIcon="@drawable/sym_keyboard_shift" android:keyWidth="15.192%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left"/> @@ -88,7 +85,6 @@ android:keyIcon="@drawable/sym_keyboard_shift" android:keyWidth="12.530%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="right"/> @@ -96,9 +92,7 @@ - diff --git a/core/res/res/xml-xlarge/password_kbd_qwerty_shifted.xml b/core/res/res/xml-xlarge/password_kbd_qwerty_shifted.xml index 671d87f45a41d..cbf17c3acbee8 100755 --- a/core/res/res/xml-xlarge/password_kbd_qwerty_shifted.xml +++ b/core/res/res/xml-xlarge/password_kbd_qwerty_shifted.xml @@ -38,10 +38,9 @@ - @@ -62,7 +61,6 @@ @@ -72,7 +70,6 @@ android:keyIcon="@drawable/sym_keyboard_shift" android:keyWidth="15.192%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left"/> @@ -88,7 +85,6 @@ android:keyIcon="@drawable/sym_keyboard_shift" android:keyWidth="12.530%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="right"/> @@ -96,9 +92,7 @@ - diff --git a/core/res/res/xml-xlarge/password_kbd_symbols.xml b/core/res/res/xml-xlarge/password_kbd_symbols.xml index 5ae5577ae186c..a58a023cc503a 100755 --- a/core/res/res/xml-xlarge/password_kbd_symbols.xml +++ b/core/res/res/xml-xlarge/password_kbd_symbols.xml @@ -38,10 +38,9 @@ - @@ -62,7 +61,6 @@ @@ -94,9 +92,7 @@ - diff --git a/core/res/res/xml-xlarge/password_kbd_symbols_shift.xml b/core/res/res/xml-xlarge/password_kbd_symbols_shift.xml index 26ade76275a9e..9d9acf5986df2 100755 --- a/core/res/res/xml-xlarge/password_kbd_symbols_shift.xml +++ b/core/res/res/xml-xlarge/password_kbd_symbols_shift.xml @@ -37,10 +37,9 @@ - @@ -61,7 +60,6 @@ @@ -92,9 +90,7 @@ -