From b0da1e70ad8284f3ede2ffe650504152c7a49442 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Tue, 1 Oct 2013 16:55:19 -0700 Subject: [PATCH] Update default keyguard clock to new UX specification Change-Id: I0d5f302d8bd5922acd45cfe1de42cb76cebc02e5 --- .../res/drawable-hdpi/ic_alarm_small.png | Bin 0 -> 1159 bytes .../res/drawable-hdpi/ic_lockscreen_alarm.png | Bin 1398 -> 0 bytes .../res/drawable-mdpi/ic_alarm_small.png | Bin 0 -> 758 bytes .../res/drawable-mdpi/ic_lockscreen_alarm.png | Bin 839 -> 0 bytes .../drawable-sw600dp-hdpi/ic_alarm_small.png | Bin 0 -> 1320 bytes .../drawable-sw600dp-mdpi/ic_alarm_small.png | Bin 0 -> 847 bytes .../drawable-sw600dp-xhdpi/ic_alarm_small.png | Bin 0 -> 1836 bytes .../ic_alarm_small.png | Bin 0 -> 2696 bytes .../res/drawable-xhdpi/ic_alarm_small.png | Bin 0 -> 1590 bytes .../drawable-xhdpi/ic_lockscreen_alarm.png | Bin 2130 -> 0 bytes .../res/drawable-xxhdpi/ic_alarm_small.png | Bin 0 -> 2513 bytes .../res/layout-land/keyguard_status_area.xml | 58 ----- .../res/layout-port/keyguard_status_area.xml | 61 ----- .../res/layout/keyguard_status_area.xml | 50 ++++ .../res/layout/keyguard_status_view.xml | 38 ++- .../keyguard_widget_remove_drop_target.xml | 2 +- packages/Keyguard/res/values-land/dimens.xml | 11 - packages/Keyguard/res/values-large/dimens.xml | 7 - .../Keyguard/res/values-sw600dp/dimens.xml | 10 +- .../Keyguard/res/values-sw720dp/dimens.xml | 3 - .../Keyguard/res/values-xlarge/dimens.xml | 27 --- packages/Keyguard/res/values/alias.xml | 5 +- packages/Keyguard/res/values/colors.xml | 4 + packages/Keyguard/res/values/dimens.xml | 26 +- .../Keyguard/res/values/donottranslate.xml | 22 ++ packages/Keyguard/res/values/strings.xml | 4 + packages/Keyguard/res/values/styles.xml | 15 ++ .../src/com/android/keyguard/ClockView.java | 223 ------------------ .../android/keyguard/KeyguardStatusView.java | 28 +-- 29 files changed, 126 insertions(+), 468 deletions(-) create mode 100644 packages/Keyguard/res/drawable-hdpi/ic_alarm_small.png delete mode 100644 packages/Keyguard/res/drawable-hdpi/ic_lockscreen_alarm.png create mode 100644 packages/Keyguard/res/drawable-mdpi/ic_alarm_small.png delete mode 100644 packages/Keyguard/res/drawable-mdpi/ic_lockscreen_alarm.png create mode 100644 packages/Keyguard/res/drawable-sw600dp-hdpi/ic_alarm_small.png create mode 100644 packages/Keyguard/res/drawable-sw600dp-mdpi/ic_alarm_small.png create mode 100644 packages/Keyguard/res/drawable-sw600dp-xhdpi/ic_alarm_small.png create mode 100644 packages/Keyguard/res/drawable-sw600dp-xxhdpi/ic_alarm_small.png create mode 100644 packages/Keyguard/res/drawable-xhdpi/ic_alarm_small.png delete mode 100644 packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_alarm.png create mode 100644 packages/Keyguard/res/drawable-xxhdpi/ic_alarm_small.png delete mode 100644 packages/Keyguard/res/layout-land/keyguard_status_area.xml delete mode 100644 packages/Keyguard/res/layout-port/keyguard_status_area.xml create mode 100644 packages/Keyguard/res/layout/keyguard_status_area.xml delete mode 100644 packages/Keyguard/res/values-xlarge/dimens.xml create mode 100644 packages/Keyguard/res/values/donottranslate.xml delete mode 100644 packages/Keyguard/src/com/android/keyguard/ClockView.java diff --git a/packages/Keyguard/res/drawable-hdpi/ic_alarm_small.png b/packages/Keyguard/res/drawable-hdpi/ic_alarm_small.png new file mode 100644 index 0000000000000000000000000000000000000000..381902933dcbc18c2475f61ddffb250be20c6c98 GIT binary patch literal 1159 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV z+ueoXKL{?^yL>WGgtNdSvKUBvfU(=jY&!-9=5S9J#}JR>t=H~$hlPr;eYkJ;xzE^d z<NN(>N)6LFmolpxOfFtpykL~x2Y>r>ZMbHUV!T#;@f$@1R}9RvK* z7MfhEnWOjZmT~nx%lBIzKAltke($x-^R~|4d(G3z?e@0V%Rye+Z*{xhF4&vdkQf== z7G*6da7Ac$RsAc2HOew>&Gl?75sP_`7pDoFUdFt_rA&I>@x>djh49_tT5-l+=688W z_R4SfUo&SJw*0-(y)ohH;T#+HjZ)!{%!M1SKT5Od%(V#Hm~(sERHij-Rt?n#z5E{p zw{{FDw zk(#B?zB^5{E)c(WP{poQP4CY73SEY8ZcEg)BCk&`*O6Jj>e(%?6m@5Z?`;eE9v69e z3TNqPM#+DF%Cv8#%+!enLgxd$-4lN}-^k~RKVjh;fAEgXrMX;Nzc!m5)ChIIV4wEE z`-f&ikQaB)DG5&X>1-BRO&7K91f0EkruA>YkLaX3@>g@_oL;a({ZXxb-t?nE*L@FW z>3!2@)}FoWL-_^ym&b~I!tP4Un>5ur{^zTQZjma_v;Y51s6WxZJ8&IO?3?Z*@%O6~A&&cV_sQzJa$t;|8*?B&>jt9>^ zda-Q!&^aOK)gK*=mv{QqpGaA1hEFM0Trla@)uR5}%HQ{7?i8B)mOUzA8`A^dBKzA? zpT(bAmqbqcF17QO$&Wz2W0R-WerNZ0kLq&dFF$p()aGCRiQ0U(ccsEVjGl=#gt5G4 zSZjaU%Qi-Pb#BzV7ni5LJaB$TV}fkM(UXTH|J<*-F2S+QscO1qJm&(r|BRJ8|6H_V+Po{zj1O`u6KbLh* G2~7ZCJ@mQ& literal 0 HcmV?d00001 diff --git a/packages/Keyguard/res/drawable-hdpi/ic_lockscreen_alarm.png b/packages/Keyguard/res/drawable-hdpi/ic_lockscreen_alarm.png deleted file mode 100644 index d7a8cfcba3c35157809d3cee33f308ef15c35539..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1398 zcmZXUYdF+-6vuxuwX{lFMX=@r*H(OJ#@<#uyqKMl-u%T!ut0iKJG` zRHk^68EMuv*UdCCp%E(^Nh;))YO_T4Z{O{+&w0-IKIfe0^PK0L7bp9$mz%oUE;Rsv zI)zO1hEyAJEfpmwHo@O8A=wg1@FW0GdtuueZ7Y<+*xqg~K-7ntff55c+1nF3LJg%bcQ+!~*tF}dl|@iRl|??rhLrrTlOFwu zhsKd8M1qgK%(Ez(92kj^ZuEQRQF`;lgI*=GUFosh&RPNu5kfeCN)O3oOS)MGODUk6!%0DlXC9C1YAsgY#euD#OP0Q#Q9r)Obd-(w0wRs%I(M7Fu8dA zROz_G)W%fW_+r-6nXcEbjSSJH_+;GTXcL@S89<9Ku7KubfLZMI! zcvA@?p-^2%M~62SBVAp^DLXsa+8!$odU57_Qb-%qCra@WmVGR;OMxPNTojA8(g#eptZHNlV!hl-ay4K z8Go&=y}kX@D@m@YVPW@aBIk5;^gM<)H#T-$AF!;gt@jf-e%mwp0dhSh^-2XZH>Z3w zUpgts%F3$u$Jkyycq<~iyHzY^f9u@0{$<%|Px(em@S-x{OwZ3J`(A$YTz=vc4xBN| z8P}5Q*9>#(tE;Q8x3#r(M2L%F*vpqLp#lQ}qI`XaipfSXu;;9v2M>dXTExsH!(+(+Rbc7V4wd4}j`^PlZ}d|So$?hRPs z@n0*XlL=0Au+g-ZlEI+8}9vnB}oA+4Bn}taDqsdw*VHV2?CI%Qo0MJ)q&st=*uTHi z6q=ix^I_NBm(PrxwDs}x6EroI(DUN7wY6jG>gtkj49~JZFE5v+Ill}cZ0~Amabz=@ zOy46%kP<>S(%v_T=wIW;me(h~H||IF6NQXCc?R|JlAD>J=74~gs;97JqYNGok_ZWb6D z8z1WoJsj5*G~s^5+!bA@GCMziHn_$#SCT$AcM^1LOmt;WEh#IKpx0u|arNhf(>M$q z{S*TdV1>1`+J|-6XKCqUX@|4K;;e1=VeN2OtWg&4>3@Le*l=bNS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG z?e42?pHP!8h2`$E!e8FLU?(h z=J(G(*IgGcWXvv(U*O`xd}*@d>kkaVH~R1CeB;%>(0g#tRoy=hnNiWb+LecITl6*m zX!w5foY|X0#x}<+OCGWFbMfp5-yb>~SvXV{ZqZ57>V*PMyH@tjmr%&3|`x2*@ z?6i69WhO1Z$IqzDe2w{+!_QI@c3lc#zm}Y=I(bsV`^W`;}|Jty|pV#!-#Ph*C$qL{9{^$&s-0tA!GNnU6 zuvW0pREe!<|DTs#9g`(DtJikV?^reUfZZHV%brKszqUUp*i_Abe)XJI%QXz!MAa{Z zzsxkttZzE+?ckNkyy~D7f{Qu+N*1s2|elzbg-`*1C28?h92GtVR zh?11Vl2ohYqEsNoU}Ruuq-$uPYhWH?Xl7+%Y6WIn85k&Za%iJy$jwj5OsmALA@ItE y=|ByVARB`7(@M${i&7aJQ}UBi6+Ckj(^G>|6H_V+Po{#>AA_f>pUXO@geCy?jx3x2 literal 0 HcmV?d00001 diff --git a/packages/Keyguard/res/drawable-mdpi/ic_lockscreen_alarm.png b/packages/Keyguard/res/drawable-mdpi/ic_lockscreen_alarm.png deleted file mode 100644 index 330ade15fb78df0eb50b66696a36b0ce57672d64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 839 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 literal 0 HcmV?d00001 diff --git a/packages/Keyguard/res/drawable-sw600dp-xhdpi/ic_alarm_small.png b/packages/Keyguard/res/drawable-sw600dp-xhdpi/ic_alarm_small.png new file mode 100644 index 0000000000000000000000000000000000000000..d9c06234b820dc9858982b43aea7188adfb68937 GIT binary patch literal 1836 zcmZ`)X*3l28~%+kW0z%0qg%G@+Ynir5zg3YjCGXDj4@;%hB21z9a733T|^m`;-Z*V zZaK{@D*L`>85Ln{udrCSipl^9I)WW&#G*xE)qCmR7XFWfF1vXeS3rz0I*#rtc@4p z)l})bd@nnh*S}-T=n%+$imaD`PMy7x;%H~kbJ^SiEuCA2W!srfsEk&LaCfpRLN>?V z?)lAhUm3iQ-<5X{R#v(!tcHA#VM2Sxk&=cJ?eojm2Y=o49v<}`mikeB<*s&ESw+!i zONaKRs#kC2KeLgD;CXoEQ9n$(C`NQMsd>Ow3(?>0>2__f{p}|4b&!G=ELzxLF=Wyt zj{qhmHyq$NUbnLXb&o7VfcZnm0SV`rH;Rlw zTpbtmh(^?k5n=98>S_DySKsSU_o0Nlz}<}%Gp;%}F^+K!wje(b!GY|fXW^@`RcVw? zZvfO^L{GTG!>70j%Uj~$iH57WoPZklnM#ZOT=PcQ!S-}XWUq=LTH0UQb?G~ui#hi~ zf*>a8XyfGUfd`NTXOoR{h;2!RFD)}|xGZpZtDD0vwNwe+LW|WGtRcoU_}!2ru=`gt z z#O`54Q?;0H+LdUH-A2Ox>KMuw+M!0ANfLG@JZpq*r|~EDW{aZ%tFILYi-xS0GR*$u z#}F4^PX&66jY3bPJ>6WX+WSo=R0+%nok+Sd!iV*Utd#7Mh$o-?ovyir=)^r#-xgif zcw%v+l^&ihyNA4hzT>?k7fU}twZTGgn#A&8wbktDEoj8!kdl{Y3Te@UKf*5iI3wlw z;RHowk$0!vh7mW3yKf?~E`@#Z^MtugwJgh-6UdRcWta7N;c?+pwZdl}a1%_Q3`>!) zwtJun(InQHCbs$jO&CDCK#LpFwF)jRCnX&3pO7#71N<)0B^SFx!?22`xr-!Ml_~YP z1U=jzcc}S{kF#CHRmzrCWr27Tp@NGt=-%WphgQD#fSKg3Xk_m5nfMfR&sq5m^8VI) zyO(OF=i`;6QTQ6&!={f1E2q{p2sWh({kJaHUG-a5Dt07!8z{A(E`~PN@=fE)3LNu0 z&9mlO#fy)Ls7YQX>zGCad|NlxcV>4@UwSpC=6RuZjhmy&M4m60O+Y?I@jlDgk{mE1 zA7+9-wk%#OIle`_=Q6r%m`_B+WyR-s{B1k4lE8hGsga)|#68q%LAX6E@+7Sb8}8rl zq^4FxusKkvc1ag|?fvY!23zJ?>=wys#?$4BW_H=6Ez@c#*@xL2&`^yx&bw3dz*@hp zqvCvIvN5f;T>TYVA(5yf#IRMaBji>@Gqe(ereakoo$Qs+5ED&abK9eVK|;l&-mm9H- zYD;bvA2~CPY^Nikg&1|_x0ElH5@!LcueR=~{P1YK!m-WcL`p=Fq#f`bto^P{mGEJA za7GFFW3hV%?}?m=b-ez;tJXM?o=jC7Ts!pu?@%WpilwUtXKRqec?u`B#9ase5jv>pC;JN3K;{6)<=dy-aAH8Zz_eFKwih+y)e?v;q z*r}-!qrPl3{?q%J@|i}(7m#=3zgdl|HaCwdH&^vu_uOGtGbsc=9kNACwQ#7^nyhbz z4po<~S}(q>U4KGJe=Wd_`DNkNsT7y6!!>#2s4-G~04{iBsByhZwf+ptuucG%cS9FJ*rq5p%oUT#9mY}wa~wOrLO7`?{N zo@aH(Hq_oRID==Naai~3{M+3`K(kIZ7oz(F+&uZ>YfV^QV9F5t_Dd^0vyo$Qe@z>H zjej#bXZ$dI|M!0gG~lyj&(3u>JpE3}zZZ}z@rq#qC7UScF@x?FC^{58W0)pRj5ByA zE%qQU@0p|~y3+ZAhoByBM~Dw5#ZxTFaTEaoW0aAxz7a|vW#(mMW@%z-i82w)mMB!) z&ZgS`1fpVs!$Ok&f8bHI8%q#C{=DEB6B3_DilYFV;FutavQrc(l;S}l1t-O}Q+|Fe N;AD3Sd*7Cr{x4suC|v*m literal 0 HcmV?d00001 diff --git a/packages/Keyguard/res/drawable-sw600dp-xxhdpi/ic_alarm_small.png b/packages/Keyguard/res/drawable-sw600dp-xxhdpi/ic_alarm_small.png new file mode 100644 index 0000000000000000000000000000000000000000..a36bf1f2a0aee7350a50de07037942e15529ae1d GIT binary patch literal 2696 zcmbVOXINAB8b@g*5o8DsMC>602WCRZfS{R}$PBZumy%MZMIisnCvy2a7~arR+9j#AQOg29s>b9DHsO{AW)R3Y=;a8 z(^zqExF+1!hbELuv7k`~tCcDYXam^>tpXHEAPo=$#ffEf#Mp&P2tX{NBf?0&cwYqz ziWhH6Qb9pUe!;>diI6HnZ14g+wKM~P6w-izR=QQDrfKPjkGwR)+IWmZ03Ss(5<21! zqr!ay0G3<@0VFIQBgDJo0e1qH;Oa&ulh*@8JOPix6LAD0hCrsd5@~om@aaJqw5dd~ zGy$9YNtals6=m>+Qf4Cr3`1<}yEK`39lp$m|EvUc|uy~wQYV_-)v|1y8{%gix zN~?nt6%bAUspZ>LLPI`ck#k@}?EYSnQP5xw&0i%pBn8~cmJ7E@A(@89rXvhDSdmyn z<5I|60)gy?Clm4R6as-lVYzcTcov1kC30K|lsS&S!ZOJO0+&s8$5Zhn0)azh67YBy zmrZpi5Z$OG4toyElc_bJObE^C6&v(^!jk?LOJk`ZP$O3b%jH|=Dj*SNhFp#!JUaG66XA7kXd9lm&;+0 z83e>9tmyxV8O~q~&R87(Q!H~wh6*$;|15pO=FjGVWQLAW8Cv6&viqEg$$|zRn-Q$N zKN|5?5*1>XdekR&%bmMy395!4p<7ZCQrEU<7QI|j*)OoOW7wD$EabnzjgvE&ob{Um zcZJRm<&~T==YOtbR0c9wBwezPlvfmgu+!%t`55b>+3M9(HzUh9G&8S*y)T;{_m1sI z;M9cI`K|sk&?)NUNTDtE%2d?dkVu_ox0l1o)-O?Rwo75R3bIE_4olLikK>bS;bpL5 zxC6|-@euM28vGnRnJ)eM*jKP*_}lLoS~Tc##kutAJI~wJpnr2Z+2(#%l;ww1KE*n= zT64YK14h=)%5nq379_|vHk9UP)Mz9ZfIF3NKKMD057*`tvg>*B-10}8LLLH- zd}h*DBtNoB--%BzWbdoZ<0VUA`v8Ktedn-$`WWn+nefy06X#aFE{?hQ?bGRtnM_ruL*XxZOW4-^zCJ%;JxFuNsX&AYlpg0iupE= z;Z@YzueT_CF!4;3f~x5M<;;opWMFOb^e<`0qNaI{F=6NX72oEpOjkG~ zKyv8Nk`WTmS{A~~w!IQ&v#cmk9d~N@)wzf;=dAo)))xaXZnhu)=l^*qhCxy1<(!pH0Tk?r`r-)^qmc41+(buZSa*@>hhCQiZzjs4CWoPA{8Vdb!FNM2j-Ig-s0r-$b zA*tMUIeACTHe}Bh4gL9m-c3G9|cxjWXPY)=Qmveep8-)Q>vdv zm*0qf>{)&u<7=^E%I|FQ}_0Ju_I+-rdy6=V~v#*VWc}r0%*Uf3V1-;R*_N zp>%I~hJ>HxHU@qr$j(_Z8=g%&dX>wF9e%Pq#kO#K-az+g(%Hy%_|(t?f_I=Mk-kdT zD&76+ZJ^*CSfCu;U%DjJ`+9k*eTvy&gf%pdousESl?OUHZF@>qb9;zK6g^q>`S62- zgHJh<2^-!#_DqP&eJLd}*<<)K@Mq6zhv!45T`8=h`h)qFl96o-aw9MHsea@Kw{*YS z)zk_*y_cR-l9xB!7W-?!jqm}RNAu`eSpOvS@eB003<_1JI(e15;FPP|i{oE9;R-*q zu7X7#XcdJXGwmG-Sh`m$%@&TVmAn-Sy4@cC))V)6gWTqFv8;aStrpkavKPOs>CmYO zI^G8HrWAAS7_i>U{>lzHDk?+yrXC*pbXg#M?Mq)zvZRVQ`rX6i6)W#$ehU{pZtQt@ zH|Ac8|IGc{VByP5%H`Z@*%1^t75!2snP|O@{ncaHMm&URs?d9N^CBNjwNZknZEib+ zHh6nLPV0-`Vkkhh?TXVT&?rZig&An@y5VuMxLQ|f+1u9uVXabprrq1G=D)tEK`!=p z>8yHnqH-kXdE4lQc+l+Ba&oNy5^%F)lN*9ca&UhU)U(m9qiKJKZhE2KIDXHcU47Za XV(J5$&l|8b{u}Z*e(Wk{blQIaoy%^2 literal 0 HcmV?d00001 diff --git a/packages/Keyguard/res/drawable-xhdpi/ic_alarm_small.png b/packages/Keyguard/res/drawable-xhdpi/ic_alarm_small.png new file mode 100644 index 0000000000000000000000000000000000000000..0290bdc1a94c626b67ea95b7f6c0a26428cf8d93 GIT binary patch literal 1590 zcmZ`(dpHw(6#m)FW^zfBD7Q!o*=AJAHO#1(TboOnZJ5Q@%q6#`i)t=i%w^vvtwN=U z5}~xDixS_|l!{i5q+CN6_iy^|`{R4g^Pcyd^FHr6|DBUQyYZ?>T_gZNmEhs(D`%4> zAe7|!BPc48lVYUvE@uF0PN~dMVDere&KK_jsyfzul{bb|58qt?B%1=jI|{&ze8d|B zARZ0Cw=e+g)SOiJEwskFJyLz!g`s?OP;(Oxg%3f%QT56G5-wU6X zT&pCFH_CI$Q@|0hpn2jPv1M1Xi3AsY=rlPU+6-&fl7LbkEEYx#u~HFRjrsf&j`Ea)C<}fn}&W1KtsW6;GOk0b9i2d-Q@I> zF$t4tW7xalHf7U6HA!V9al-HR8I8~+3(AjpS;~`tO4-BuLWWc4d1SlUc(o#4C=-Ft zkUOv~S5>CpBG~ua-vNE?H&E=y-I!Sf+tX9YJDUh+b

`5lqLpq{Z&yL;itB|*cA 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 diff --git a/packages/Keyguard/res/drawable-xxhdpi/ic_alarm_small.png b/packages/Keyguard/res/drawable-xxhdpi/ic_alarm_small.png new file mode 100644 index 0000000000000000000000000000000000000000..66968e8e8cd59abe78be3631d019d13b2bdf07cc GIT binary patch literal 2513 zcmbVOXH-*Z8jhm^A}B?QfKIqn5t7_MDn&^Xlu!aO0Z~c0fe0ytKtdlOE}@AcB8X*R z#RCy`ETEu>3PBt}*%^Cf0Nbo6DhoKU;v_2W{_xC?z2CX_Ywz>C{hV7E9=gud*v=RR zgP8^gQ5d=ztAC9Qbl(!{wnw^Yxtz+DM@j^81xE(K0{Idy1P>N*;voja;io764Ee!e z^98~vwwz55A@U?51V=A}P>Q5FGz{jqMk(d+5+OO93&jh?{=nF|3jkcm_Xk)QI*KkO zLkYs53>g%e5gNtINaPXtz?uNKpOUB}5J7SdTq#Ntrx2C?z$ad!ZmmB?0`N~F@0OQ(kXHV^j|Z+ zDV-9PE`^W`C`FPgC9yF&{sMGrei~dV2kt~Baa)~TTB1xL7fbax~T#}L?k;2K5 z7&x876N>eFeR@87OMzsA`=Nks5Z@g)ksq2C9C!H}^amV`osbAAWn$T$j(Mh(OT zg1{Fn|Nn^@QfCZOUmX8aEOSS?3e+#ZmcDNDwRs@1u481n)_}Q~WWZns^MWaXQOf(H zF~Wpc=CaOl0opsb^m2=En+=Z|5wnSPQv+AGdRUh(j)?Niv$FAA_VGn-t`W0>F}1$& zNA3yg`dG7Ra#AiE$7qg;v2XsRMd(v|^p#Kb@`2jH?vb~hxG68o;{NSr(T@+#yjGmf ze4W0hapSRPAKj}BPUwf_A+|lo`DyA?qiB-wWMR6>MYUnkh{}fH+JIzwVfB=xg+oyjE6zO$ z=rUkU$z5)f+RFYJn!vcT(;^4xuzK@gW5;#v%N+J__{H}%i^hk{8F#&xSZ;AHsSivt z9^&lkbN7R(kE0va0=S9>nsH=&i<`c$TLReRaQ~k=q)s!Z~Lcp!%--bh}?}>d3Eg95WM0b3D z>3Jh*rW)4wjyna9en0Zs^#FqVQ=Xa9%2)wh&b+yUd&%zwe8`Hwc1!7@mS0Kd_D`u4o7Jt3(NCBm&3W}zqw{U|F=J*I z&fH5_n`UxVbxl?Co8xq6uhFrg=_c(u>d}d@nI#pr>yz4puFWpJb7?fG(Xdt&_V7S& z6YE~YRZH6eYh@!XJ#Fch6puq2$tMofvtlZyTjarE^ej{BSBn!93)s@7*s!qJ@7J0c z?%rQ&k9F+q;xEunHI%lgvu|FMZMv1}ntuLz7Q?!Ma&hsPRsD5`+EtTd=T)s3&GtIY z{LR0vkxcsbbS!tzS`{EMU(`PsgD?iLHl2vbF+=4*XZDVuWurNUMiO7o7WnDnqWU_c z@+qSa@P8q5w%>KjWNMI3%Rdy~-NHY{XMf9eMJbTlaE6pW=2+8m5T30OK^K?kLl8FU= zFFCd?i%OBL@Yr4I>Uea1nxH?xVBfZL6_w+4Gf#n2Od+;HbvNMY1JRTN~arST+CcxF?Ras!e?(D2Z!ut-MHjINh~c zI`6~&svF%o>A6PjtM@V$w}|L=vj<0qOJ4S#vM3*UuQaGU#$B=Eg+f_*1YGwj{;-Qz zUbey^Tr4dfk#zG-&X;rA+6vIZLc2T7o&?wZjfLtzdZmwI+q<1@UT^9sIsFLqoOVh+ znCWn%qBUc)>&|z!g_4uuqb?yW0~53*C)q3F{uu88PJ0}`StGO@F_~0T^9O6+mLGi> zw{uPNDov*U^ZVuMY08b;O?;baE3Z=w63M~t;W|OH1#hg8}Tlcz_-pzG2ywmA@H}pSQ!PHR7KS*(Te*)-o B4GI7N literal 0 HcmV?d00001 diff --git a/packages/Keyguard/res/layout-land/keyguard_status_area.xml b/packages/Keyguard/res/layout-land/keyguard_status_area.xml deleted file mode 100644 index d450c5c6e83cf..0000000000000 --- a/packages/Keyguard/res/layout-land/keyguard_status_area.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/packages/Keyguard/res/layout-port/keyguard_status_area.xml b/packages/Keyguard/res/layout-port/keyguard_status_area.xml deleted file mode 100644 index af0d2e8f03047..0000000000000 --- a/packages/Keyguard/res/layout-port/keyguard_status_area.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - diff --git a/packages/Keyguard/res/layout/keyguard_status_area.xml b/packages/Keyguard/res/layout/keyguard_status_area.xml new file mode 100644 index 0000000000000..d1f387375668f --- /dev/null +++ b/packages/Keyguard/res/layout/keyguard_status_area.xml @@ -0,0 +1,50 @@ + + + + + + + + diff --git a/packages/Keyguard/res/layout/keyguard_status_view.xml b/packages/Keyguard/res/layout/keyguard_status_view.xml index 2304d9f33bc88..5857fc24ea097 100644 --- a/packages/Keyguard/res/layout/keyguard_status_view.xml +++ b/packages/Keyguard/res/layout/keyguard_status_view.xml @@ -35,34 +35,26 @@ android:layout_height="match_parent" android:gravity="center_horizontal|top" android:contentDescription="@string/keyguard_accessibility_status"> - - - + - - - - + android:layout_gravity="center_horizontal|top" + android:textColor="@color/clock_white" + android:singleLine="true" + style="@style/widget_big_thin" + android:format12Hour="@string/keyguard_widget_12_hours_format" + android:format24Hour="@string/keyguard_widget_24_hours_format" + android:baselineAligned="true" + android:layout_marginBottom="@dimen/bottom_text_spacing_digital" /> - diff --git a/packages/Keyguard/res/layout/keyguard_widget_remove_drop_target.xml b/packages/Keyguard/res/layout/keyguard_widget_remove_drop_target.xml index 294c3862612d8..58b5b271d5d9a 100644 --- a/packages/Keyguard/res/layout/keyguard_widget_remove_drop_target.xml +++ b/packages/Keyguard/res/layout/keyguard_widget_remove_drop_target.xml @@ -26,7 +26,7 @@ android:drawablePadding="4dp" android:text="@string/kg_reordering_delete_drop_target_text" android:textColor="#FFF" - android:textSize="13sp" + android:textSize="12dp" android:shadowColor="#000" android:shadowDy="1.0" android:shadowRadius="1.0" diff --git a/packages/Keyguard/res/values-land/dimens.xml b/packages/Keyguard/res/values-land/dimens.xml index 64e043cfb93f9..bf30332f1ef5b 100644 --- a/packages/Keyguard/res/values-land/dimens.xml +++ b/packages/Keyguard/res/values-land/dimens.xml @@ -19,17 +19,6 @@ --> - - 47dip - - 50dip - - 2dip - 72dp - - - 70sp - 30dp diff --git a/packages/Keyguard/res/values-large/dimens.xml b/packages/Keyguard/res/values-large/dimens.xml index 8cd614dfe4c98..0b5d4ad6ba7b1 100644 --- a/packages/Keyguard/res/values-large/dimens.xml +++ b/packages/Keyguard/res/values-large/dimens.xml @@ -17,13 +17,6 @@ */ --> - - 75dip - - 75dip - - 48.0mm - 192dip diff --git a/packages/Keyguard/res/values-sw600dp/dimens.xml b/packages/Keyguard/res/values-sw600dp/dimens.xml index c0e3937d474fc..f8a13626f4633 100644 --- a/packages/Keyguard/res/values-sw600dp/dimens.xml +++ b/packages/Keyguard/res/values-sw600dp/dimens.xml @@ -18,9 +18,6 @@ */ --> - - 112sp - 364dp @@ -37,9 +34,6 @@ 141dp - - 25.5dp - 16sp @@ -68,4 +62,8 @@ 12dp + + 16dp + 141dp + diff --git a/packages/Keyguard/res/values-sw720dp/dimens.xml b/packages/Keyguard/res/values-sw720dp/dimens.xml index b29ac2299f8dd..0790b79220594 100644 --- a/packages/Keyguard/res/values-sw720dp/dimens.xml +++ b/packages/Keyguard/res/values-sw720dp/dimens.xml @@ -21,9 +21,6 @@ 188dp - - 34dp - 19sp diff --git a/packages/Keyguard/res/values-xlarge/dimens.xml b/packages/Keyguard/res/values-xlarge/dimens.xml deleted file mode 100644 index b8cf287848ed2..0000000000000 --- a/packages/Keyguard/res/values-xlarge/dimens.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - 75dip - - 75dip - - 48.0mm - diff --git a/packages/Keyguard/res/values/alias.xml b/packages/Keyguard/res/values/alias.xml index c96439181b2ab..b22311e78a9f6 100644 --- a/packages/Keyguard/res/values/alias.xml +++ b/packages/Keyguard/res/values/alias.xml @@ -34,9 +34,6 @@ @*android:drawable/ic_contact_picture - - @*android:drawable/ic_lock_idle_alarm - @*android:string/ok @@ -52,4 +49,4 @@ @*android:integer/config_activityDefaultDur - \ No newline at end of file + diff --git a/packages/Keyguard/res/values/colors.xml b/packages/Keyguard/res/values/colors.xml index 0c56a43301ca3..a9e80616bc436 100644 --- a/packages/Keyguard/res/values/colors.xml +++ b/packages/Keyguard/res/values/colors.xml @@ -23,4 +23,8 @@ #CC000000 + + + #ffffffff + #80ffffff diff --git a/packages/Keyguard/res/values/dimens.xml b/packages/Keyguard/res/values/dimens.xml index ce72f43cd7102..8039b09b3f09c 100644 --- a/packages/Keyguard/res/values/dimens.xml +++ b/packages/Keyguard/res/values/dimens.xml @@ -18,17 +18,6 @@ */ --> - - 56dip - - 56dip - - 4dip - - 3dip - - 9dip - 270dp @@ -47,9 +36,6 @@ 15dip - - 80dip - 14dip @@ -84,11 +70,8 @@ 75dp - - 15dp - - 13dp + 12dp 16dp @@ -166,5 +149,12 @@ used on tablets; on phones, this size is determined by the space left by the security mode. --> 160dp + + + -8dp + 14dp + 12dp + 80dp + 120dp diff --git a/packages/Keyguard/res/values/donottranslate.xml b/packages/Keyguard/res/values/donottranslate.xml new file mode 100644 index 0000000000000..71d3ed7d5ff9c --- /dev/null +++ b/packages/Keyguard/res/values/donottranslate.xml @@ -0,0 +1,22 @@ + + + + + + EEE, MMMM d + + EEEE, MMMM d + diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml index 89e72409f8b41..65322e3b584fc 100644 --- a/packages/Keyguard/res/values/strings.xml +++ b/packages/Keyguard/res/values/strings.xml @@ -94,6 +94,10 @@ progress dialog in the meantime. this is the emssage. --> Unlocking SIM card\u2026 + + h:mm + + kk:mm %1$s. Widget %2$d of %3$d. diff --git a/packages/Keyguard/res/values/styles.xml b/packages/Keyguard/res/values/styles.xml index a31f708601d49..44f560fe2c875 100644 --- a/packages/Keyguard/res/values/styles.xml +++ b/packages/Keyguard/res/values/styles.xml @@ -52,5 +52,20 @@ @anim/lock_screen_enter @anim/lock_screen_exit + + + + + diff --git a/packages/Keyguard/src/com/android/keyguard/ClockView.java b/packages/Keyguard/src/com/android/keyguard/ClockView.java deleted file mode 100644 index ad85e9a450b76..0000000000000 --- a/packages/Keyguard/src/com/android/keyguard/ClockView.java +++ /dev/null @@ -1,223 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.keyguard; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.database.ContentObserver; -import android.graphics.Typeface; -import android.os.Handler; -import android.os.UserHandle; -import android.provider.Settings; -import android.text.format.DateFormat; -import android.util.AttributeSet; -import android.view.View; -import android.widget.RelativeLayout; -import android.widget.TextView; - -import java.lang.ref.WeakReference; -import java.text.DateFormatSymbols; -import java.util.Calendar; - -/** - * Displays the time - */ -public class ClockView extends RelativeLayout { - private static final String ANDROID_CLOCK_FONT_FILE = "/system/fonts/AndroidClock.ttf"; - private final static String M12 = "h:mm"; - private final static String M24 = "HH:mm"; - - private Calendar mCalendar; - private String mFormat; - private TextView mTimeView; - private AmPm mAmPm; - private ContentObserver mFormatChangeObserver; - private int mAttached = 0; // for debugging - tells us whether attach/detach is unbalanced - - /* called by system on minute ticks */ - private final Handler mHandler = new Handler(); - private BroadcastReceiver mIntentReceiver; - - private static class TimeChangedReceiver extends BroadcastReceiver { - private WeakReference mClock; - private Context mContext; - - public TimeChangedReceiver(ClockView clock) { - mClock = new WeakReference(clock); - mContext = clock.getContext(); - } - - @Override - public void onReceive(Context context, Intent intent) { - // Post a runnable to avoid blocking the broadcast. - final boolean timezoneChanged = - intent.getAction().equals(Intent.ACTION_TIMEZONE_CHANGED); - final ClockView clock = mClock.get(); - if (clock != null) { - clock.mHandler.post(new Runnable() { - public void run() { - if (timezoneChanged) { - clock.mCalendar = Calendar.getInstance(); - } - clock.updateTime(); - } - }); - } else { - try { - mContext.unregisterReceiver(this); - } catch (RuntimeException e) { - // Shouldn't happen - } - } - } - }; - - static class AmPm { - private TextView mAmPmTextView; - private String mAmString, mPmString; - - AmPm(View parent, Typeface tf) { - // No longer used, uncomment if we decide to use AM/PM indicator again - // mAmPmTextView = (TextView) parent.findViewById(R.id.am_pm); - if (mAmPmTextView != null && tf != null) { - mAmPmTextView.setTypeface(tf); - } - - String[] ampm = new DateFormatSymbols().getAmPmStrings(); - mAmString = ampm[0]; - mPmString = ampm[1]; - } - - void setShowAmPm(boolean show) { - if (mAmPmTextView != null) { - mAmPmTextView.setVisibility(show ? View.VISIBLE : View.GONE); - } - } - - void setIsMorning(boolean isMorning) { - if (mAmPmTextView != null) { - mAmPmTextView.setText(isMorning ? mAmString : mPmString); - } - } - } - - private static class FormatChangeObserver extends ContentObserver { - private WeakReference mClock; - private Context mContext; - public FormatChangeObserver(ClockView clock) { - super(new Handler()); - mClock = new WeakReference(clock); - mContext = clock.getContext(); - } - @Override - public void onChange(boolean selfChange) { - ClockView digitalClock = mClock.get(); - if (digitalClock != null) { - digitalClock.setDateFormat(); - digitalClock.updateTime(); - } else { - try { - mContext.getContentResolver().unregisterContentObserver(this); - } catch (RuntimeException e) { - // Shouldn't happen - } - } - } - } - - public ClockView(Context context) { - this(context, null); - } - - public ClockView(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - mTimeView = (TextView) findViewById(R.id.clock_text); - mTimeView.setTypeface(Typeface.createFromFile(ANDROID_CLOCK_FONT_FILE)); - mAmPm = new AmPm(this, null); - mCalendar = Calendar.getInstance(); - setDateFormat(); - } - - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - - mAttached++; - - /* monitor time ticks, time changed, timezone */ - if (mIntentReceiver == null) { - mIntentReceiver = new TimeChangedReceiver(this); - IntentFilter filter = new IntentFilter(); - filter.addAction(Intent.ACTION_TIME_TICK); - filter.addAction(Intent.ACTION_TIME_CHANGED); - filter.addAction(Intent.ACTION_TIMEZONE_CHANGED); - mContext.registerReceiverAsUser(mIntentReceiver, UserHandle.OWNER, filter, null, null ); - } - - /* monitor 12/24-hour display preference */ - if (mFormatChangeObserver == null) { - mFormatChangeObserver = new FormatChangeObserver(this); - mContext.getContentResolver().registerContentObserver( - Settings.System.CONTENT_URI, true, mFormatChangeObserver); - } - - updateTime(); - } - - @Override - protected void onDetachedFromWindow() { - super.onDetachedFromWindow(); - - mAttached--; - - if (mIntentReceiver != null) { - mContext.unregisterReceiver(mIntentReceiver); - } - if (mFormatChangeObserver != null) { - mContext.getContentResolver().unregisterContentObserver( - mFormatChangeObserver); - } - - mFormatChangeObserver = null; - mIntentReceiver = null; - } - - void updateTime(Calendar c) { - mCalendar = c; - updateTime(); - } - - public void updateTime() { - mCalendar.setTimeInMillis(System.currentTimeMillis()); - - CharSequence newTime = DateFormat.format(mFormat, mCalendar); - mTimeView.setText(newTime); - mAmPm.setIsMorning(mCalendar.get(Calendar.AM_PM) == 0); - } - - private void setDateFormat() { - mFormat = android.text.format.DateFormat.is24HourFormat(getContext()) ? M24 : M12; - mAmPm.setShowAmPm(mFormat.equals(M12)); - } -} diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java index 0289a1f4d1d2c..ffb619bda4dac 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java @@ -38,17 +38,9 @@ public class KeyguardStatusView extends GridLayout { private static final boolean DEBUG = KeyguardViewMediator.DEBUG; private static final String TAG = "KeyguardStatusView"; - public static final int LOCK_ICON = 0; // R.drawable.ic_lock_idle_lock; - public static final int ALARM_ICON = R.drawable.ic_lock_idle_alarm; - public static final int CHARGING_ICON = 0; //R.drawable.ic_lock_idle_charging; - public static final int BATTERY_LOW_ICON = 0; //R.drawable.ic_lock_idle_low_battery; - - private SimpleDateFormat mDateFormat; private LockPatternUtils mLockPatternUtils; - private TextView mDateView; private TextView mAlarmStatusView; - private ClockView mClockView; private KeyguardUpdateMonitorCallback mInfoCallback = new KeyguardUpdateMonitorCallback() { @@ -81,21 +73,12 @@ public class KeyguardStatusView extends GridLayout { @Override protected void onFinishInflate() { super.onFinishInflate(); - Resources res = getContext().getResources(); - final Locale locale = Locale.getDefault(); - final String datePattern = res.getString(R.string.system_ui_date_pattern); - final String bestFormat = ICU.getBestDateTimePattern(datePattern, locale.toString()); - mDateFormat = new SimpleDateFormat(bestFormat, locale); - mDateView = (TextView) findViewById(R.id.date); + mAlarmStatusView = (TextView) findViewById(R.id.alarm_status); - mClockView = (ClockView) findViewById(R.id.clock_view); mLockPatternUtils = new LockPatternUtils(getContext()); - // Use custom font in mDateView - mDateView.setTypeface(Typeface.SANS_SERIF, Typeface.BOLD); - // Required to get Marquee to work. - final View marqueeViews[] = { mDateView, mAlarmStatusView }; + final View marqueeViews[] = { mAlarmStatusView }; for (int i = 0; i < marqueeViews.length; i++) { View v = marqueeViews[i]; if (v == null) { @@ -107,8 +90,6 @@ public class KeyguardStatusView extends GridLayout { } protected void refresh() { - mClockView.updateTime(); - refreshDate(); refreshAlarmStatus(); // might as well } @@ -117,17 +98,12 @@ public class KeyguardStatusView extends GridLayout { String nextAlarm = mLockPatternUtils.getNextAlarm(); if (!TextUtils.isEmpty(nextAlarm)) { mAlarmStatusView.setText(nextAlarm); - mAlarmStatusView.setCompoundDrawablesWithIntrinsicBounds(ALARM_ICON, 0, 0, 0); mAlarmStatusView.setVisibility(View.VISIBLE); } else { mAlarmStatusView.setVisibility(View.GONE); } } - void refreshDate() { - mDateView.setText(mDateFormat.format(new Date())); - } - @Override protected void onAttachedToWindow() { super.onAttachedToWindow();