| commit | aaf522dda5b583f59e0f677c9fb2ddcc186340b2 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Sat Jan 30 23:32:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jan 30 23:32:44 2021 +0000 |
| tree | d61dc769e4ae3ad5c129c9ec90cf3502b47247e0 | |
| parent | 06fd370cf8146677158e99feaa0b75c7a01c4f2a [diff] | |
| parent | 264a7e92ba6eb75e5ec1b2f3456798db13be330c [diff] |
Merge "Update clock to 2x2" into sc-dev am: 5fb31dd756 am: 264a7e92ba Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13439807 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5d46edcbd4908a7f3ebe02a6620008a55a44372a
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml index 80c8a28..35a2195 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 62d3093..ca99563 100644 --- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java +++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
@@ -38,7 +38,7 @@ * 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;