Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-31 16:43:07 +00:00
committed by Android (Google) Code Review
parent 3cace2a148 e06956e5cd
commit cbab3edc3e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -379,7 +379,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
setScrimBehindAlpha(0f); setScrimBehindAlpha(0f);
} else if (mWakeAndUnlocking) { } else if (mWakeAndUnlocking) {
// During wake and unlock, we first hide everything behind a black scrim, which then // 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) { if (mDozing) {
setScrimInFrontAlpha(0f); setScrimInFrontAlpha(0f);
setScrimBehindAlpha(1f); setScrimBehindAlpha(1f);