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

Commit a406ddd0 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev am: f33b1eda 

am: fb8e9add

Change-Id: I01bf252c08decae7f82ce854332c3b4a342b5ee3
parents a4232923 fb8e9add

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

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 


    public void setBouncerShowing(boolean showing) {

        mBouncerShowing = showing;

        mAnimateChange = !mTracking && !mDontAnimateBouncerChanges;

        mAnimateChange = !mTracking && !mDontAnimateBouncerChanges && !mKeyguardFadingOutInProgress;

        scheduleUpdate();

    }