From a504d9c172a3bf2a15bb61c574f9d99f3137ce79 Mon Sep 17 00:00:00 2001 From: Beverly Date: Fri, 29 Jan 2021 17:22:10 -0500 Subject: [PATCH] Update clock to 2x2 Instead of pyramid single digit hour of minutes. Also, adjust vertical spacing to between minutes and hours to be further. Test: manual Bug: 170228350 Change-Id: Ic91b7e973fbe0b28d1520e0febcf9835a095e162 --- .../SystemUI/res-keyguard/layout/keyguard_clock_switch.xml | 4 ++-- .../src/com/android/keyguard/AnimatableClockView.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml index 80c8a285bfc6e..35a2195accabf 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml @@ -76,7 +76,7 @@ android:textSize="100dp" android:includeFontPadding="false" android:fontFamily="@font/clock" - android:lineSpacingMultiplier=".65" + android:lineSpacingMultiplier=".7" android:typeface="monospace" android:elegantTextHeight="false" dozeWeight="200" @@ -97,7 +97,7 @@ android:gravity="center_horizontal" android:textSize="@dimen/large_clock_text_size" android:includeFontPadding="false" - android:lineSpacingMultiplier=".65" + android:lineSpacingMultiplier=".7" android:fontFamily="@font/clock" android:typeface="monospace" android:elegantTextHeight="false" diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java index 62d30935dd5c6..ca99563986b42 100644 --- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java +++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java @@ -38,7 +38,7 @@ import kotlin.Unit; * The time's text color is a gradient that changes its colors based on its controller. */ public class AnimatableClockView extends TextView { - private static final CharSequence FORMAT_12_HOUR = "h\nmm"; + private static final CharSequence FORMAT_12_HOUR = "hh\nmm"; private static final CharSequence FORMAT_24_HOUR = "HH\nmm"; private static final long ANIM_DURATION = 300;