Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 3298264: Update LockScreen DigitalClock with new font

Browse Source 
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
This commit is contained in:
Jim Miller
2010-12-20 13:10:13 -08:00
parent 2a1cc5ac30
commit d0fd007058
9 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/res/res/layout-xlarge/keyguard_screen_status_land.xml
View File

@@ -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"
/>
</com.android.internal.widget.DigitalClock>

5
core/res/res/layout-xlarge/keyguard_screen_status_port.xml
View File

@@ -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"
/>
</com.android.internal.widget.DigitalClock>

5
core/res/res/layout/keyguard_screen_tab_unlock.xml
View File

@@ -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"
/>
<TextView android:id="@+id/timeDisplayForeground"
@@ -88,7 +88,7 @@
android:textSize="72sp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginBottom="6dip"
android:textColor="#666666"
android:textColor="@color/lockscreen_clock_foreground"
android:layout_alignLeft="@id/timeDisplayBackground"
android:layout_alignTop="@id/timeDisplayBackground"
/>
@@ -103,6 +103,7 @@
android:textSize="22sp"
android:layout_marginLeft="8dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/lockscreen_clock_am_pm"
/>
</com.android.internal.widget.DigitalClock>

5
core/res/res/layout/keyguard_screen_tab_unlock_land.xml
View File

@@ -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"
/>
<TextView android:id="@+id/timeDisplayForeground"
@@ -89,7 +89,7 @@
android:textSize="72sp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginBottom="6dip"
android:textColor="#666666"
android:textColor="@color/lockscreen_clock_foreground"
android:layout_alignLeft="@id/timeDisplayBackground"
android:layout_alignTop="@id/timeDisplayBackground"
/>
@@ -104,6 +104,7 @@
android:textSize="22sp"
android:layout_marginLeft="8dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/lockscreen_clock_am_pm"
/>
</com.android.internal.widget.DigitalClock>

5
core/res/res/layout/keyguard_screen_unlock_landscape.xml
View File

@@ -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"
/>
<TextView android:id="@+id/timeDisplayForeground"
@@ -91,7 +91,7 @@
android:layout_marginBottom="6dip"
android:layout_alignLeft="@id/timeDisplayBackground"
android:layout_alignTop="@id/timeDisplayBackground"
android:textColor="#666666"
android:textColor="@color/lockscreen_clock_foreground"
/>
@@ -106,6 +106,7 @@
android:textSize="22sp"
android:layout_marginLeft="8dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/lockscreen_clock_am_pm"
/>
</com.android.internal.widget.DigitalClock>

5
core/res/res/layout/keyguard_screen_unlock_portrait.xml
View File

@@ -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"
/>
<TextView android:id="@+id/timeDisplayForeground"
@@ -79,7 +79,7 @@
android:textSize="56sp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginBottom="6dip"
android:textColor="#666666"
android:textColor="@color/lockscreen_clock_foreground"
/>
<TextView android:id="@+id/am_pm"
@@ -92,6 +92,7 @@
android:textSize="18sp"
android:layout_marginLeft="4dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/lockscreen_clock_am_pm"
/>
</com.android.internal.widget.DigitalClock>

5
core/res/res/values/colors.xml
View File

@@ -103,6 +103,11 @@
<color name="keyguard_text_color_soundon">#e69310</color>
<color name="keyguard_text_color_decline">#fe0a5a</color>
<!-- keyguard clock -->
<color name="lockscreen_clock_background">#ff9a9a9a</color>
<color name="lockscreen_clock_foreground">#ff666666</color>
<color name="lockscreen_clock_am_pm">#ff9a9a9a</color>
<!-- For holo theme -->
<drawable name="screen_background_holo_light">#fff3f3f3</drawable>
<drawable name="screen_background_holo_dark">#ff000000</drawable>

BIN
data/fonts/AndroidClock.ttf
View File

Binary file not shown.

BIN
data/fonts/AndroidClock_Highlight.ttf
View File

Binary file not shown.