Merge SP1A.210604.001

Change-Id: I5200ee05285ae422d5e9c1c00f45709a5d6188be

1 files changed, 25 insertions, 0 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
index 41d991c25393..63867c0f7308 100644
--- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
+++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
@@ -44,6 +44,7 @@ public class AnimatableClockView extends TextView {
     private static final CharSequence SINGLE_LINE_FORMAT_12_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 APPEAR_ANIM_DURATION = 350;
     private static final long CHARGE_ANIM_DURATION_PHASE_0 = 500;
     private static final long CHARGE_ANIM_DURATION_PHASE_1 = 1000;
 
@@ -156,6 +157,30 @@ public class AnimatableClockView extends TextView {
         mLockScreenColor = lockScreenColor;
     }
 
+    void animateAppearOnLockscreen() {
+        if (mTextAnimator == null) {
+            return;
+        }
+
+        setTextStyle(
+                mDozingWeight,
+                -1 /* text size, no update */,
+                mLockScreenColor,
+                false /* animate */,
+                0 /* duration */,
+                0 /* delay */,
+                null /* onAnimationEnd */);
+
+        setTextStyle(
+                mLockScreenWeight,
+                -1 /* text size, no update */,
+                mLockScreenColor,
+                true, /* animate */
+                APPEAR_ANIM_DURATION,
+                0 /* delay */,
+                null /* onAnimationEnd */);
+    }
+
     void animateDisappear() {
         if (mTextAnimator == null) {
             return;