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

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

Merge "Don't animate large clock appearance on AOD" into sc-dev am: 006b3a23 am: 769864a5 

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

Change-Id: If2f12ee8b82ef8a692c72ad9d8fb211a22374bb1
parents 76137414 769864a5

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

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie 


    /** Animate the clock appearance */

    public void animateAppear() {

        mView.animateAppear();

        if (!mIsDozing) mView.animateAppearOnLockscreen();

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ public class AnimatableClockView extends TextView { 
        mLockScreenColor = lockScreenColor;

    }



    void animateAppear() {

    void animateAppearOnLockscreen() {

        if (mTextAnimator == null) {

            return;

        }