From 2b192ec57bbd54e885f161f760fc51d76bf08424 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Thu, 27 Jul 2017 18:19:32 +0200 Subject: [PATCH] AOD: Fix flicker at end of AOD2 Fixes a flicker at the end of pulsing out. Instead of the hard cut we animate out and then hard cut to AOD1. Change-Id: I64149bb734c10e07e3da2822548a4651b9fb48db Fixes: 64077859 Test: Receive notification, let it time out; verify no flicker at end of fading out. --- .../systemui/statusbar/phone/DozeScrimController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java index 2dc467f2add15..2283c130190c0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java @@ -322,7 +322,7 @@ public class DozeScrimController { mHandler.removeCallbacks(mPulseOutExtended); if (DEBUG) Log.d(TAG, "Pulse out, mDozing=" + mDozing); if (!mDozing) return; - startScrimAnimation(true /* inFront */, mDozeParameters.getAlwaysOn() ? 0 : 1, + startScrimAnimation(true /* inFront */, 1, mDozeParameters.getPulseOutDuration(), Interpolators.ALPHA_IN, mPulseOutFinished); } @@ -336,6 +336,9 @@ public class DozeScrimController { // Signal that the pulse is all finished so we can turn the screen off now. pulseFinished(); + if (mDozeParameters.getAlwaysOn()) { + mScrimController.setDozeInFrontAlpha(0); + } } }; }