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 
am: cbab3edc3e

Change-Id: I49d8dc5f8cdd470064c9450e6722a905a4d1b0ed
This commit is contained in:
Adrian Roos
2017-07-31 16:48:44 +00:00
committed by android-build-merger
parent 9fadf818c6 cbab3edc3e
commit 3bc413bca8
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);