From d0fd007058ec378fdaf4666bd8294db7ded35453 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Mon, 20 Dec 2010 13:10:13 -0800 Subject: [PATCH] Fix 3298264: Update LockScreen DigitalClock with new font This updates the font used to show the AM/PM indicator as well as creating shared colors for DigitalClock components in all LockScreen layouts. Change-Id: I87fcba67b421660bddb9b10213ac62704a49b7b9 --- .../keyguard_screen_status_land.xml | 5 +++-- .../keyguard_screen_status_port.xml | 5 +++-- .../res/layout/keyguard_screen_tab_unlock.xml | 5 +++-- .../keyguard_screen_tab_unlock_land.xml | 5 +++-- .../keyguard_screen_unlock_landscape.xml | 5 +++-- .../keyguard_screen_unlock_portrait.xml | 5 +++-- core/res/res/values/colors.xml | 5 +++++ data/fonts/AndroidClock.ttf | Bin 2336 -> 3004 bytes data/fonts/AndroidClock_Highlight.ttf | Bin 2212 -> 2872 bytes 9 files changed, 23 insertions(+), 12 deletions(-) diff --git a/core/res/res/layout-xlarge/keyguard_screen_status_land.xml b/core/res/res/layout-xlarge/keyguard_screen_status_land.xml index 7a20f9aadf83a..f91fe4f185d66 100644 --- a/core/res/res/layout-xlarge/keyguard_screen_status_land.xml +++ b/core/res/res/layout-xlarge/keyguard_screen_status_land.xml @@ -60,7 +60,7 @@ android:ellipsize="none" android:textSize="120sp" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="#999999" + android:textColor="@color/lockscreen_clock_background" android:layout_marginBottom="6dip" /> @@ -71,7 +71,7 @@ android:ellipsize="none" android:textSize="120sp" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="#666666" + android:textColor="@color/lockscreen_clock_foreground" android:layout_alignLeft="@id/timeDisplayBackground" android:layout_alignTop="@id/timeDisplayBackground" android:layout_marginBottom="6dip" @@ -87,6 +87,7 @@ android:textSize="30sp" android:layout_marginLeft="8dip" android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/lockscreen_clock_am_pm" /> 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 4e87b216cd0b2..c529e0bddb7a8 100644 --- a/core/res/res/layout-xlarge/keyguard_screen_status_port.xml +++ b/core/res/res/layout-xlarge/keyguard_screen_status_port.xml @@ -59,7 +59,7 @@ android:ellipsize="none" android:textSize="120sp" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="#999999" + android:textColor="@color/lockscreen_clock_background" android:layout_marginBottom="6dip" /> @@ -70,7 +70,7 @@ android:ellipsize="none" android:textSize="120sp" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="#666666" + android:textColor="@color/lockscreen_clock_foreground" android:layout_marginBottom="6dip" android:layout_alignLeft="@id/timeDisplayBackground" android:layout_alignTop="@id/timeDisplayBackground" @@ -86,6 +86,7 @@ android:textSize="30sp" android:layout_marginLeft="8dip" android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/lockscreen_clock_am_pm" /> diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index 03bd45bc6e522..77ae0d3f5a281 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -77,7 +77,7 @@ android:textSize="72sp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginBottom="6dip" - android:textColor="#999999" + android:textColor="@color/lockscreen_clock_background" /> @@ -103,6 +103,7 @@ android:textSize="22sp" android:layout_marginLeft="8dip" android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/lockscreen_clock_am_pm" /> 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 bb0c012df095a..e48df2033aeca 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml @@ -78,7 +78,7 @@ android:textSize="72sp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginBottom="6dip" - android:textColor="#999999" + android:textColor="@color/lockscreen_clock_background" /> @@ -104,6 +104,7 @@ android:textSize="22sp" android:layout_marginLeft="8dip" android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/lockscreen_clock_am_pm" /> diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml index a6face9908257..c14afbf1a4d54 100644 --- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml @@ -78,7 +78,7 @@ android:textSize="72sp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginBottom="6dip" - android:textColor="#999999" + android:textColor="@color/lockscreen_clock_background" /> @@ -106,6 +106,7 @@ android:textSize="22sp" android:layout_marginLeft="8dip" android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/lockscreen_clock_am_pm" /> diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index 42144aba380ab..85e1db190fba6 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -68,7 +68,7 @@ android:textSize="56sp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginBottom="6dip" - android:textColor="#999999" + android:textColor="@color/lockscreen_clock_background" /> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index b1c54ff068308..a286265fdc53f 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -103,6 +103,11 @@ #e69310 #fe0a5a + + #ff9a9a9a + #ff666666 + #ff9a9a9a + #fff3f3f3 #ff000000 diff --git a/data/fonts/AndroidClock.ttf b/data/fonts/AndroidClock.ttf index 39451831c1a04c6eff79e4768ad28e512c11b027..24a7f087234b99b3ac57044abf2a1a1596b4e09d 100644 GIT binary patch literal 3004 zcmd5;Z){sv6+h=bKR+jKoW7-w+cb&ZtH<1}t>gIBaTPjfY8DWvBV=6}O{?J~@7XUT zcI3ECy&+x+gc zr-<}+2z5x>Aw<*0C1(b^JRlfQ6W;kj(uM)yRzJ9KoSL?#X68%tT;FG-}@!@e~Rt5 z@^*Iqz3;qx5qpqHV|gIdHxs zrZe>t6}C}fxH^@Y!#g{p7Ere7}?SISKMHR%5w_8%na8^+0(t}i^=d-PuvRBi)9 zZ;buk-=2pX4Y46EV;vwNv1s5Cm*L52<)B=O4NsB;w_4c4^wUxDc__&V)%ZW=t+5h6 z=J!Yi_eF6HxTl*lZ_+4(T9Ar3ZP9K4a-MP?n1_@EEh|Rj2%Uy)EkEQgFOuoaClHko zP4NxdFXxXNtZna$>)?^=gH0U&n}*S4llI6l=;iC^Z|#DG|U-9qM{??Y86q!C%VsmClmYI4`@*IyTxYmO=8VFev>Ce}q1R6%e= zbj^(EX^@-ZvJM%*I#rTe#EY4yi?A!AJk8R4>{^fL$t2#zwzDNRi3_4 zyT#Y8LN>Q$BmRA6B&?ZX^yvMZPMIllN~o?|pA}l|eJHt7y8|T^r{Xvjn{ioufS)5n ztVt1))$8J6HAR?HLb?U@D z37uLvno1)qg}=GCYc&yl^7hZ)c?W*r&TZwWhjc=LGE9@!#Zqbf!cfF1Gu(^^9J4IA z)>H^nA8UprdAMR%EAR+ksbNgz5Y7i3r)nec+cl-&&46c3`=WZU&6{s;74FF` zT3Q1w?k7vP^eLpWcB`dx19+SOQ`cfBW-Ef47Aw_T`CPT?^7GZIJOtG$$UFS=&Wsh+ z+qJTmYZkS1(kl}OmF%Now)q*zAEtX~j6MlBW4prrLp;bs98FmfD{Ue7M_K;HQqf+H zMYU+!ij45#5srh{->b&7h?(Mj1KhuF5AWRWGcT_JIRVWgED7Lkv&Uh^z{Ar$QH3ijTw2KAoaJ@*CmpgP%U`yZv1b6s6s zft`U+(0^c6?d~~!HsDu$ennN%t1~mJM}%Jyn&Jw^4C7)_XIH~qN<3kq?t1uOJ< zmh~g)eYBgu--1;#_*x701OHFFbS1L!_LcEJPX=!73jQ;c2i~O>;9cw%fSaZwc5UFx zz!yE-Dt61DHE7bql)bq`InWuDq&Qwv19xy9RApMmYdeDOv}onrq>V$O1L^|!%5*PL zretT!_PjA$F*5m*yHa+u1!KB6YnRF^#e%Wwmh;ABu~42YmU6a{j3Fp~IBA`GJ#v~BXZ(W%@RHe9Ftl z3cPA&BjKr$F_+!IN2gs{aS^UWVlB|hjI55~yilPo?NC(Z|>KA5n)OH@)Gp^>yOQT>Bi$PbEkE`MkDH(~M?xSlAI5d6iM zpslsUw-l$mvr!{3Mf_9ZyC%yMxxi0>81>`CH&5lxPU8rkCVv-kvy_{%Gk?v!4FrFs z{qLsBRS#S6F)%Tf107LQq;F*wWOp>eC*F zodbF7K^&uo+1!QWIuad|k`R+%#M}?EDo2qQ!^j&)9=wzcRg^!qHu~9Qh%r;*0hrta zoC+Uh4}o~I+5Ewmgy>ocfQgZ-R_9Q9_YETu>I4}?S3V0eVWmVEuxsm6gqL0oPe zkWssF(Q(8vyOGs5R_MOZQ;&U5g;U{tK}PF~>}uN{@8TM3AQG}7oYCE4ByFXwyo|bT zW53*5ze>Zi^+g)4IW@Mfz1fRhZY@g{4kk{VG-!XWQ9eUY@UC6|-*3*M27F$LVy|Y!zCX zx@J@lGs=0n)%VocFJ`&MmUQ7*z;m5GyS2|yB$^&!SuuRo@ewC^;Y#d|(1 z(1(T(ON7J*A2zUEobllR`ov`)4&q^P(}%mzCnNMJ0zI_qY2IYICK5-v^o>lu2lWiG$~+LsxC_xk0)aBc$}2BWu?*?_kCsYU!mq}4FBH-?>*0<#2T#S o?OcZep2C^qoT+oTl)-#TSQDD0~rWACf|N+`D2+V{=>14JX4j{pDw diff --git a/data/fonts/AndroidClock_Highlight.ttf b/data/fonts/AndroidClock_Highlight.ttf index fa0221ebafb0295670887dd3d20d5f40db099039..1e14a8f726a1915bdc44847a344924d82057f127 100644 GIT binary patch literal 2872 zcmd5;X>1!s6n<~k>vdw1bkjPfX%elw1kIc; z71t7oA`n7|Uleil2mIoa0D<^{1Z_a#Mu0dXfgm(N@B@&L5Qh*#vH5209I65m|CsU2 zyyKhq-n==y#6;9Ur%0i}fq@$j+|=ClE0Mnq(zfew=!qTrY4|H5J_7#m$are9ZRFq& zM8XGIVPx7dC?rZm%5BhlvZ<-bN(Gk4zX7~2J66hk`QmI2`WMhX&ZSeMzuoiAN$BR# z`f?DcpDMdyOX4rdjXNi;z4h?Tz|-Ne{7A}oN_!A96GC$=o@d={(H=)0d#2N5D z5>kqSIpPdfa#ZP(teA5xNph(KTuBSN>>GuZC`~FxWd|KaY_)YrEss&i9S>l|jWo!gaH|}ZMscV*N?JCa zUE*1*VkIx$;;k;<1xy3x|3Mw7vdDO3Yjgb(je(P%+pxw#jO$RPzMuBcJ~{wdisXJ1 zV%K?DsNTZsJv8pqGk=SmBL;($*w?VV>$Cn5b5`VqIguV=BumsU(`_5 zG*Z(#y#{I~T7Lna&cj-LpFI>+Tqegiz zKf?0#3c3Hh6{kWW?5m}R^suFyA+G!Wop;2U#Y{-Z%L*L!Ow0(gid(OnddSkXm$Sli z>#f2pC;3SE=?qM9E4n*f9EJ3R&aGKKn_c{R#Rkt*Z6vIK*%`M2gW0T5?RgYjeIX7> zKQ0EZLJ0aWnkEj}wjG}@eN!yO)`*7@Gsi7m!WRF^3Ul#mzIv|wsvCD^CGO66Fd%&b zxA;IdGoLBVpFh8bz4e-Ib;9k-*(^V1+rmtjpI%sS*EdVA)a(%_0vgZ$_#-D5?nE-( zbM5Lpxcv=;)5HNS9M|EnGhoIO;Y7d`Gx6>A;-6W|g6Wx3YzW0#Kuj~w$%y8PuFKqYaN70RL6_p}UXC!r8v-ru+{W!} z#;u?w&r5tK%U@sIY~rw~nF%Y{!`pi}0*XdZQQrT*Bb5! zhkYziQP63-lSz*8{lh*@QM`&*B&LUkrgsQca+-FG+uMu9SSu?&k57SARaMcNIhHyn z9I30T^R4qW`n_F6wZ7r#u+OV_yo#zMibF%i9m1;!P4W7MA0A4{KL%=~ z=a=8eYjO9hZy!?&H`i!Eb-b%aE7ZeJ)o2g32(?D5v`$=6qrH&djyua9oE~}ztx7X( zqwi|8pl04uqZPWDuddM^+Qy&PXq61nR-?VNOUEkwyeI_0ECjpHRFnJd^+j-8q?4(5-i3(i!2!YJBK&KSr~I0N}YHf_Wr zQRA|l<4pGV^kg8-NNHp$6PZXmFt!JFN8u@tXh*TOF;F9P0+H>9B#Y?AYNG@2#AqRJ zk0$Z0a>CeeXLDm{kgowqs7q2kiK3tT3Kqpv37t)zY**0 z?u~WFqP>{#U;O^#k`KGPJ%!v!O(P$KsfAZVCR{mD6 zq{$NUgL9-!|=Z3Er9(E6#njg^M^q7S%x2}`o^IxqDXW8XKsDuqi{|o0(VInP%qE zGCPck7{l5h+^}Q;#5SyiuoMv%CYrdg&}!5W5~Pc|von78&1;QKV@OfOZ?zXReJ<)b6x`HAf>Ze61MfaBoE zq-!81>wxwu^?_o(HqmU-6C!6RM~Y+h!qu)TkEtJ|{oRtCw-#UjCQjWf$7>}5!C$oz z>NZi{Q5tv8#I^7!@YDRM}j(eGSIVlq{24+k;z>0@pi5}7;u(TucT#G8+lS9k0vSCy4)adZ5>7%3~ zcd!P7G{COpEcXyFo6Y8Tz9mFxB>|}HS5}Iw*VMdKO$!7=;mEqD)^FIjO7p)Jy|a#8 zUf;*_H3$o5a2^+N72o1FcC|7wuGKE?nuahE(*iwxGvNRprKUr{*}fS~lEt*9;GlwM z!Xfcz-wc=aQ7Wy+^zO7CkBM~;Zrzd>mI^V+t0x&pozl4H6YY9jkEQkSouYhcbX3M0 zIdQCUsjy-vZno@t)6sZmCLOhkMHzSI*mzZ?Jg0nlHW463eK$u~o^u>0Ggtp+v2x8xQJbA|fc{rhY9YY*$`PKLcx zEQ%YBBja}C()>JY5Hf@>eSZ+WOf2;9p~%g@$EzDyS%&~`>qh7_kA}N5Is z-e_DdWcD~qKNizzy1rRY?U`yEoU2bx)>Bt(X0p02J*;=?@r+z>8gI~^>nLv8jqCF& zXP}KcyL`6a#-~0n&@MLkJTJ0H_`C*FeB$!~+ARM!f_O%D`FIHJa#-EGz&iT>n4`rD zbm14Dm)IZ-pVx3gWPCn=F7dU`2Vuy7&xg<@d--3i!bTo0zZMLfM4jIpO2i%1h&$Al zi5*6TTAR2_yy9U~)Vj1a(C;CxN2@5(&OnNPHIsBFEnM~qWYNQ3@NE@s*(T_*K5OGbaC?DkixMcYUvOk-!sbtket zJq4l#g(hl+MA>%f>;U~*j8tK^7Hb54*avUtg%LFM%GAXb|;g& zQ)ZGgo-E|rH6Ha=pvEd&yJ~uAsJ&C&;3IBVYYvy)G?NL_G>QC|a6G;0HDGJL&yv?_ vZ3G3a+OY{yY{nLB#Wp;L?R