| commit | 3bc413bca88b12e3aed1532360e5a26b7e556e04 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Mon Jul 31 16:48:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 31 16:48:44 2017 +0000 |
| tree | 33fb5a05511116de33728c1ec16772ddd1b86c29 | |
| parent | 9fadf818c6be103f8cb8014931fca6aec52540fa [diff] | |
| parent | cbab3edc3eb7ff33126e31c45fd059b45ebb41ca [diff] |
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev am: cbab3edc3e Change-Id: I49d8dc5f8cdd470064c9450e6722a905a4d1b0ed
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 5b2b50b..f9dd8bf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -379,7 +379,8 @@ setScrimBehindAlpha(0f); } else if (mWakeAndUnlocking) { // During wake and unlock, we first hide everything behind a black scrim, which then - // gets faded out from animateKeyguardFadingOut. + // gets faded out from animateKeyguardFadingOut. This must never be animated. + mAnimateChange = false; if (mDozing) { setScrimInFrontAlpha(0f); setScrimBehindAlpha(1f);