From e06956e5cd5336517b778b540d088d856ccb0f8d Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Mon, 31 Jul 2017 15:56:24 +0200 Subject: [PATCH] WakeAndUnlock: Make sure blanking is never animated Fixes an issue where instead of immediately blanking the screen upon authenticating via fingerprint we animated to blank because another animating transition was requested at the same time. Change-Id: I141079c0d4de1776c8328057d364eeb0964eebaf Fixes: 64080116 Test: Unlock via fingerprint a lot. Verify no flicker. --- .../com/android/systemui/statusbar/phone/ScrimController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 5b2b50bfe2f36..f9dd8bf5b202c 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 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 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);