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

Merge "Update clock to 2x2" into sc-dev am: 5fb31dd756

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13439807

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieecc7e7f1142b8cc78de8c594f7a2769b68220f6
This commit is contained in:
Beverly Tai
2021-01-30 23:06:31 +00:00
committed by Automerger Merge Worker
parent b0374f6df3 5fb31dd756
commit 264a7e92ba
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
View File

@@ -76,7 +76,7 @@
android:textSize="100dp" android:textSize="100dp"
android:includeFontPadding="false" android:includeFontPadding="false"
android:fontFamily="@font/clock" android:fontFamily="@font/clock"
android:lineSpacingMultiplier=".65" android:lineSpacingMultiplier=".7"
android:typeface="monospace" android:typeface="monospace"
android:elegantTextHeight="false" android:elegantTextHeight="false"
dozeWeight="200" dozeWeight="200"
@@ -97,7 +97,7 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textSize="@dimen/large_clock_text_size" android:textSize="@dimen/large_clock_text_size"
android:includeFontPadding="false" android:includeFontPadding="false"
android:lineSpacingMultiplier=".65" android:lineSpacingMultiplier=".7"
android:fontFamily="@font/clock" android:fontFamily="@font/clock"
android:typeface="monospace" android:typeface="monospace"
android:elegantTextHeight="false" android:elegantTextHeight="false"

2
packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
View File

@@ -38,7 +38,7 @@ import kotlin.Unit;
* The time's text color is a gradient that changes its colors based on its controller. * The time's text color is a gradient that changes its colors based on its controller.
*/ */
public class AnimatableClockView extends TextView { 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 CharSequence FORMAT_24_HOUR = "HH\nmm";
private static final long ANIM_DURATION = 300; private static final long ANIM_DURATION = 300;