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

Commit 769864a5 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 

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

Change-Id: I15359ee99da36db3b68354317269f4304e6ff03f
parents bad6f3ae 006b3a23

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;

        }