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

Commit 4f0b641e authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "AOD/LS - Fix 24 hour clock" into sc-dev am: 2aecd8d7 am: 8a6fb5fc 

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

Change-Id: I70683d0ffb7c45cfbd7a2984fb49ca2b0a92d45b
parents 386cb7cb 8a6fb5fc

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public class AnimatableClockView extends TextView { 
    private static final CharSequence DOUBLE_LINE_FORMAT_12_HOUR = "hh\nmm";

    private static final CharSequence DOUBLE_LINE_FORMAT_24_HOUR = "HH\nmm";

    private static final CharSequence SINGLE_LINE_FORMAT_12_HOUR = "h:mm";

    private static final CharSequence SINGLE_LINE_FORMAT_24_HOUR = "H:mm";

    private static final CharSequence SINGLE_LINE_FORMAT_24_HOUR = "HH:mm";

    private static final long DOZE_ANIM_DURATION = 300;

    private static final long CHARGE_ANIM_DURATION_PHASE_0 = 500;

    private static final long CHARGE_ANIM_DURATION_PHASE_1 = 1000;