commit 1d6357c800cb43a88a4f0b6533024b306a37ca0f
author Adrian Roos <roosa@google.com> Thu Jul 27 21:31:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 27 21:31:16 2017 +0000
tree 214f234d1a560571e3befac36a0f9a1503d36b42
parent bbc80d97888aef8f988b7ef1e8725c45555f42cc
parent 3889146f8215248f669f92ff4a2363379a9935b1

Merge "AOD: Fix flicker at end of AOD2" into oc-dr1-dev
am: 3889146f82

Change-Id: I4484f507451a8959a024e1dc09c66c9b2d24f358

packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java

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 2dc467f..2283c13 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 @@
             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 @@
 
             // Signal that the pulse is all finished so we can turn the screen off now.
             pulseFinished();
+            if (mDozeParameters.getAlwaysOn()) {
+                mScrimController.setDozeInFrontAlpha(0);
+            }
         }
     };
 }