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

Commit 1edb3d3a authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB][Scene] Ignore animateIn/Out methods on status bar if flag enabled. 

The new scenes framework should automatically handle in/out animations,
and we can define custom animations once the transitions framework is
ready. For now, just ignore the old animate in/out methods.

Bug: 300484307
Test: enable scenes, verify status bar still appears on lockscreen and
disappears on AOD, shade, bouncer, etc.

Change-Id: I2363b6e2356083327c309989f5445c5c1361b873
parent 8f9c2b72

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java

+8 −0
Original line number Diff line number Diff line
@@ -479,6 +479,10 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 


    /** Animate the keyguard status bar in. */

    public void animateKeyguardStatusBarIn() {

        if (isMigrationEnabled()) {

            return;

        }



        mLogger.log(TAG, LogLevel.DEBUG, "animating status bar in");

        if (mDisableStateTracker.isDisabled()) {

            // If our view is disabled, don't allow us to animate in.
@@ -495,6 +499,10 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 


    /** Animate the keyguard status bar out. */

    public void animateKeyguardStatusBarOut(long startDelay, long duration) {

        if (isMigrationEnabled()) {

            return;

        }



        mLogger.log(TAG, LogLevel.DEBUG, "animating status bar out");

        ValueAnimator anim = ValueAnimator.ofFloat(mView.getAlpha(), 0f);

        anim.addUpdateListener(mAnimatorUpdateListener);