Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaf522dd authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Update clock to 2x2" into sc-dev am: 5fb31dd7 am: 264a7e92 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d46edcbd4908a7f3ebe02a6620008a55a44372a
parents 06fd370c 264a7e92

packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java

+1 −1
Original line number Diff line number Diff line
@@ -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;