Merge "Don't animate large clock appearance on AOD" into sc-dev

2021-05-18 14:05:30 +00:00
parent 797ae050c2 acb528f2d7
commit 006b3a23c7
2 changed files with 2 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
+++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
@@ -170,7 +170,7 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie

    /** Animate the clock appearance */
    public void animateAppear() {
-        mView.animateAppear();
+        if (!mIsDozing) mView.animateAppearOnLockscreen();
    }

    /**
--- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
+++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
@@ -157,7 +157,7 @@ public class AnimatableClockView extends TextView {
        mLockScreenColor = lockScreenColor;
    }

-    void animateAppear() {
+    void animateAppearOnLockscreen() {
        if (mTextAnimator == null) {
            return;
        }