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

am: f33b1eda88 Change-Id: I2ea9ccbfe01cfa948fb6dc6012859fc43a5c284b
2017-07-12 14:07:21 +00:00
parent dbdf7c1484 f33b1eda88
commit fb8e9add4b
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -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();
    }