From b450a65c1c833e40d8c85a7670ed64f8be34102b Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Thu, 6 Jan 2011 21:36:17 -0800 Subject: [PATCH] Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE] This change list: - simplifies the UI design to reduce the number of on-screen items by combining Alarm status with the date line. - updates many of the layout files to match closer to the final design. - Simplifies the logic for showing Status1 info. It's now more predictable and robust. - updates the layout for tablets - contains a modified alpha to work well with different backgrounds (Tested: white, gray, and dark backgrounds) - updates the tablet icons to something closer to the final size. Manual merge from Change-Id: Ifb349dfa778e9c91b0649c8d95229607be5af8e5 Change-Id: Ia2a9a2d285102d0208b3a7fcead58d6454d116ae --- .../ic_lock_idle_alarm.png | Bin 2831 -> 650 bytes .../ic_lock_idle_charging.png | Bin 1762 -> 679 bytes .../ic_lock_idle_lock.png | Bin 1554 -> 521 bytes .../ic_lock_idle_low_battery.png | Bin 1782 -> 607 bytes .../keyguard_screen_password_landscape.xml | 29 ++-- .../keyguard_screen_password_portrait.xml | 28 ++-- .../keyguard_screen_status_land.xml | 42 +++-- .../keyguard_screen_status_port.xml | 40 +++-- .../keyguard_screen_tab_unlock.xml | 18 +- .../keyguard_screen_tab_unlock_land.xml | 25 +-- .../keyguard_screen_unlock_landscape.xml | 141 +++++++++------- .../keyguard_screen_unlock_portrait.xml | 19 ++- .../res/layout/keyguard_screen_tab_unlock.xml | 15 +- .../keyguard_screen_tab_unlock_land.xml | 15 +- .../keyguard_screen_unlock_landscape.xml | 9 + .../keyguard_screen_unlock_portrait.xml | 9 + core/res/res/values/colors.xml | 5 +- .../internal/policy/impl/LockScreen.java | 41 +---- .../policy/impl/PatternUnlockScreen.java | 8 +- .../internal/policy/impl/StatusView.java | 158 +++++++----------- 20 files changed, 310 insertions(+), 292 deletions(-) diff --git a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_alarm.png b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_alarm.png index 336a82068ad3346f79e9e63b85f31624ca130e2a..97ac02361a2dfc9781f9530b094061a4a7f99141 100644 GIT binary patch literal 650 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 diff --git a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_charging.png b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_charging.png index ebef53189a1825d8d971f7caae981f6f243a0eea..4210db26765af22142111466059205b3107ea130 100644 GIT binary patch literal 679 zcmV;Y0$BZtP)98L2wJjEf&;9{R6};SFm%9A|fmpjW~I~ALH-K z&MfX`w#&*S(;Aa97QpsD|27sq_xRQyY}lR*^rHCx+uiRLjar zB~(E66!*QHEg5uS{xhG?kEWPYlI@$7q`C`diP-KiYXvt<(xe}NwITE^AY!(9hz=j$ zQ_B-Lte2(LYAq70PBBf-N_ z!|5@vZ55Dfl;jA2dxEDQ`|lUfMEcmS0=mSxfbEa1{w;QvzubQU3;^{glA(21PU`>w N002ovPDHLkV1myRJiGt^ literal 1762 zcmV<81|9i{P)001%w1^@s66k{gi00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igb= z00SmrAdeRS00v@7L_t(&-tC%Qh+S6|$Ny`cz0bY5>4%d$9cRK^JEKE78AH)hYrq(6 zn?kG&Q4qfnX)Fjn`Jf2ahx#J;Bt;a|Ctoar;9HCajgWML0TrusGML~b8EVpYGEFDk zd(YWl%ZE89+)VG+q@#0M&JQ+s7|z{i&7ZaQ`LA^bC@Co^DJdx_DJdx_c~?Sr@+A== z0FwZA19%UBy8u+SARYnG0&o++3V>IL=z3AaQk%KB-EOniS_7B^@Fakb19$+y`vCA3 z#dH(EWdMH%@TU;M3Fq8Ov)ObbBO~&T$*d$v?$=s>jfg%A;QmaYXbXkPvnynuO#uH4 zA^g}FbD~zOtrcD@5z!*@pon}Iz{dcL4cwUMw$DC$cm25o1K181i`8zo zXNljou-3K!d~R}b^6aHcmv-dWFtZqAqBKqG z*4jt3*2m&Fe!NntRN^@984EMlMdYiaqoY5{O0!sERVtN_6457miR7FUYb`nFV6BCS z+!9Vi?h=s}08C9ywYz-1xv;SCMy*ym&&*#0@GJmQN_EX(5!vaze>8;f%R-7pM56%i z-gxHZSZm1`^Rl(}cWIjDnMYZfB}BB+Z~wWuxtjo9US3}Q6@Wd={22f$ilT0%sJ!;RvioSghtuWOcVFcCud27uEd^63x)dadja>KptZp#WfFV#2lC?U!1u)=BUE zO1FD??~$e{k|ZfcW{JpbnxA6+O(3Eaz%NEdMy?LCR~*M4 zz@OXgb^_p!M6@g0FBgg8IA&%(UkIOd`SRswl~UiUR;#+#6R=BrLK_9l?E`@QV`F3I zwmR^or6ro4o|bLREF!7^(BAty7Cbkltyb%12*Ld?0{?#t)m1F-y#|18kM3c5!A@h^ z&&0kH=_XbSK=9u4Fs)4pL7a2sy@zvdql>>gn@Zr_T86KS$Sc;`hEi%^Hf5&ts7wp}c(^{HmF83Xu0k|eWADJZ4h za`xmUni)pgieTb6CTs1di0JWNLS;_AS_lVUuh*Tm_C+H4rgQG|08Zsjy>sQRIy0qq zPiT5M z26r<93dZeKii?i|%>HIAaFCL)K3=<6a9_n4Hzd+$OB|0=9l#+b7q zgi|7ND30S>?tG9b&B`Xh`b&qdL{W4PGe1N`UlEZfMWohm@@kA}TWimF?^lZ|){6l4 zipZgClrq#yh>mH*4;K~|UhUEpb7l?h6Oji1?CMv3#uyl5)jZYUs=YfHP;#=n%sDLkLetQS=3+)Ra;RQ548rE%s zH2|-Q$m=4q6hio$_x`MN?)>4yhu_3DbI0{_{P^*PQfe;|y%#_oz-YF3Lq9jn#DYbn z4d6Ab|3k>Ch+IjMWbx?Hqc>1eQc_YP!xSHc{Yh@wNNt% zA`!RRP3Yu55Jx8$!Buc@aMVBIB0>ij7eSmA5m%A^fPyWiR%uDv=F4+6PePMU_QK)a z-1qLepM=M8%>FA1n}G+JR;*n{Zd&uwx*)#yAXxDw0l=Mjl5z}?u zgw24-%Ol~A;~XIJ8FUNKP|`cVK@b8eY)iOzp}&D}-?FUxOeW*;xQdRiq#A9Z#5T$) zp?;J41(`>->*&>59*F`cpHe1(koEihi)OP~YqeT+IK9y1=q{OHklPco%dJh$t8%&A zH4LMR?*|anrOZ2{R

001%w1^@s66k{gi00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igb= z00aSxYplBf00ojsL_t(&-tC&(YaDeH$G_({znyK8Zkvs@Qm`aZY0?%N0~W1dtFd0d zM^PyHB6z|60sa|234-qxu}HBGLQ(34dO?Vyu(Y+2me4|N8@5Skl9}J{oZ~}g!np2k zCP@oB=^hw%C)snz?=$DV0lLzau5_g<0033prmEG=avr){hN39ywbt$;qAGyx0IC2U z0$>4L2XGC*5`YB}`Nvv2b6>)WqG*RP<_TlWt3-4dz@q?yMn?nim#R*w>X+X8Gv#vm z8WHh*6KZiBANAg!VCEalJkQLYnYG2`nR$Vk=a~6BW`12&EdV&@sMF7CH;|74=iJN2 zn0Eji1<<$Ru0$<$0Q4lchgG%gz2`WNzbTbUvzr!{b8g5Oa~!}607|L~RfULvnIR(o zjdvm#V-N%ZhzPVy^eF(x0n`DU-ITBv78V{5k!OkMc>txvYv7!Nb1sgeD0a^I3^29U znlKD)xm@02tqoFWsyd;nKhMw4PgW|G*-ZzFh=u^XA|i%}AR=(iVQFaz-uqMD`_Dw= zcK~sc*gZ4%$8mf_RX+&Ba8IdJLJ%z10A_xMng0av`KE&B@sUh=v_RUhv3oV6}k%v@sTiil9=&=C<$4i67U?R1BR zhHewl&1^wPu5FtVR&r2nIIMW@7jx=Isa^(J`Sj`2!DbA@l|yDP5z(Cbs;VpC6L7S3 z>sHgru-01*7t@2LJyZ|`Dk67s>c?pnP5Uovt)G~faD|37Gc!{rq6&Zt5s|9S8e;}C z;Rqr^sZ88rGxvD!_cmGebTlk6 z#3hHDW$0z6J=6;%|jZqP|ywJy(UJU|*U z%*@{VX=eUtY;5d@1~XRxT&dM+*O>V+W6Vgh0Bi~*wOL45?GkflT)CsFr&RSyD_ebi zecyZUYpOaVBIVV*wbR1Tlf%&&-!0fbv>Aw9rjy-jGNRDXQwn$Hz7KnIzYShVjC*4r`Gh2*el@W$qV=$mg|F z*bctcn6ruu12|r*)m}^%ce_+|WKG+^qI%XEtDyqu2XHXC)+||2g=!tvvd>DRXrq5r zVRM#qPSUMI`kycNQqqUxy$7e;!=k`q=5L*I2blTkcH4)$4Gh5FM05hn-}n>;*10&2 zz4!jtB<`9Umkv+0`37E@Bjb+07*qoM6N<$ Eg3991z5oCK diff --git a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_low_battery.png b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_low_battery.png index f349b633498d2e4eed9376c692af4f85b0a7295a..72e4afa14becc3320b99d9675bdcb35846d20078 100644 GIT binary patch literal 607 zcmV-l0-*hgP)Fhrf zQmJ;mJOOYem&?7tw1UJktfo2Op>?mvW806bs!8)mptcDudtf>gn@{~&V=me&-V zh*esW^5W^^OkH0{*l}5{=xc$Ae*gFhw zDLN%SWOC(}$VWKv*w9ni69A%2bg+4%6uoh^wqZWr9M??V0P-001%w1^@s66k{gi00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igb= z01X5x!{dDb00wqRL_t(&-tAdSY+Y9sUHja7-?d{q&Zi`#P2$9MD?4#41)PL@EDWS> z0Flx*kwPG8ZK^b-cBPNueR754HM1>TPsAxWj=tYTDIsPcIE5{DD z<2cXuyZ4;EnA{s)jT5^qA%6B-(jL60bI)gK?S1y%2PmP05=tncgryF--wTkuvxbPU zn91`04{NLh5CX^p7%h=?Z)JT6z!m_V0A4RS^IZ_fakX>q4d>jbbMB4F$;s+sK99Ly z6Gu^0DI)CvS`t@mF~+n{PEJ;qWHbYllargRwP&rhk+qiA+9-;mv$loof*|;Wh&->Ve*p0Al5xXZ zw{A5VW4=Xl9Z6Vg5y$aF6h*&r&h4+OtEGRkt! z?GlkAA`&>~5XUj%I388ipV!vbUIBouTen64qS4XOeIin?ssIp($Pr`AIRKXyy|P9| zMm|IG0Lf}qg|!ye+MILltTE<7I_}1e8{x>vNUMl^iey+2%c@C!d3bnu&!Q%)udmOD z$YB7VCy69h!CHIKTKl_An>OVOhOZ%cR8?2al7HIW4k{`t_Nr>D zs;){^m5_CQY;5e!8Tr>EBoCzuEHskKNw$Vz_{8AgV7TbW5|JvB-&NHusj8wVf^+U4 zs`~DZ9Xo7+3qB$uZ6fl}3<3+SK}25geSg7rB|ehu2L}h2TWi~mF|8ykNFojFs`^Kg z@66~x>;v#@N@|j7!1sN4o(E$L0F;s3702=8*REZAYvaa^6N`c@Rox~cCrGYHej|z^ zjpKNbT@H}q-z&k}x zR##V770Ffr?Wzh9NpHXjRsEH!_RjpKuCDHN%xEe1_4REq#(c*Z^UdT&1OQJ&9w+&? z{{H^X4I4I$7ByLAWo3s+9!+CTTK@$>FsiDrH8wW(&o#%;(9nt~ik<{;LRFW~Qj8x} z)f)hQwvfo0_fr^2>F@8~1mINwhh`aa6TmM>PKihWASO8o;MX-ZHACs3?(Xht-}j#r zk#CDg<2}~<{q*$o%W)j{HZ?V|sFZc(%9Zj=Ci8UwJ7+r^fE6P0LRv&8s(Ty2TL6Xt zptrZT9KbUqI{-AM%ADn<1<4)0?;rC#?vpz)wkTo@baJdmf^&Ozo@F;BiTUGn=e@;%SGg%i0rw1`Eq8#$E+X-cB|@BBC>iu z6IyGbs$C@ioTM6`2Jk$|FWfCg%~2_=B>A-O`_};cWx*=z{Q2`ffTu_voR1RH?kLIk z!Z7@MHk+*>`6H5F{Sa!JEq)yYaOljLGyZ}ktGl~fDl03$MsgoXbFT-8)U34tkR$m| zl2c(AzDBZDRlWIqe>Y1=+gnvtb-c5)(=0f$^7;J3Nj-a#^gn0C&>U=g86*_EvkAr zo6W9XFacgfwgGsN63$I&g3`E2Mcx8He`p0c; zZT5k<;q>&hA=%@c`)w3Ox2?5z0{4SPx)0Cu5ClP`F{URB!=ic3E}?`HN+_X(5|$kP Y4c>gnA>T`A&;S4c07*qoM6N<$f*-^{*Z=?k 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 c2d87a2a47924..4bc729248c3f2 100644 --- a/core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml +++ b/core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml @@ -22,18 +22,23 @@ android:layout_height="match_parent" android:orientation="horizontal" > - - - - - - + + + + + + + + - - - + + + - - - - + android:layout_weight="1"> + + + + @@ -58,7 +56,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="120sp" + android:textSize="98sp" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/lockscreen_clock_background" android:layout_marginBottom="6dip" @@ -69,7 +67,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="120sp" + android:textSize="98sp" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/lockscreen_clock_foreground" android:layout_alignLeft="@id/timeDisplayBackground" @@ -92,15 +90,29 @@ - + android:layout_marginTop="10dip"> + + + + + + - + @@ -130,9 +143,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="22sp" + android:textSize="17sp" android:layout_marginTop="20dip" android:singleLine="false" + android:textColor="@color/lockscreen_owner_info" android:visibility="invisible" /> diff --git a/core/res/res/layout-xlarge/keyguard_screen_status_port.xml b/core/res/res/layout-xlarge/keyguard_screen_status_port.xml index c529e0bddb7a8..346b21e87b84f 100644 --- a/core/res/res/layout-xlarge/keyguard_screen_status_port.xml +++ b/core/res/res/layout-xlarge/keyguard_screen_status_port.xml @@ -44,8 +44,6 @@ @@ -57,7 +55,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="120sp" + android:textSize="98sp" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/lockscreen_clock_background" android:layout_marginBottom="6dip" @@ -68,7 +66,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="120sp" + android:textSize="98sp" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/lockscreen_clock_foreground" android:layout_marginBottom="6dip" @@ -91,15 +89,29 @@ - + android:layout_marginTop="10dip"> + + + + + + @@ -129,8 +142,9 @@ android:layout_height="wrap_content" android:layout_marginTop="20dip" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="22sp" + android:textSize="17sp" android:singleLine="false" android:visibility="invisible" + android:textColor="@color/lockscreen_owner_info" /> diff --git a/core/res/res/layout-xlarge/keyguard_screen_tab_unlock.xml b/core/res/res/layout-xlarge/keyguard_screen_tab_unlock.xml index c76e8339bdc9b..1c7b7e210aedf 100644 --- a/core/res/res/layout-xlarge/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout-xlarge/keyguard_screen_tab_unlock.xml @@ -29,15 +29,18 @@ android:id="@+id/root" android:background="#70000000"> - - + - - + android:orientation="vertical"> + + - - - + + + + + + + android:background="#70000000"> - - - - + + - - + android:layout_marginLeft="102dip" + android:layout_marginTop="320dip" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true"/> - - -