From 5909d0134d7eaf16fd4e7c9c01f60d0d4980f499 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Tue, 10 Oct 2017 17:31:09 -0700 Subject: Fixed problem where scrim transition would be cancelled Change-Id: I089e499bfaf524898f5156aecaf098c94b9a1b2b Fixes: 64077859 Test: send notifications, look at AoD --- packages/SystemUI/src/com/android/systemui/doze/DozeUi.java | 3 --- .../src/com/android/systemui/statusbar/phone/DozeScrimController.java | 2 +- .../src/com/android/systemui/util/wakelock/DelayedWakeLock.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java index dc626fb4df65..851b78cfcd49 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java @@ -84,9 +84,6 @@ public class DozeUi implements DozeMachine.Part { case DOZE_REQUEST_PULSE: pulseWhileDozing(mMachine.getPulseReason()); break; - case DOZE_PULSE_DONE: - mHost.abortPulsing(); - break; case INITIALIZED: mHost.startDozing(); break; 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 021b4518efbe..8afb8490808e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java @@ -384,7 +384,7 @@ public class DozeScrimController { if (mDozeParameters.getAlwaysOn()) { // Setting power states can happen after we push out the frame. Make sure we // stay fully opaque until the power state request reaches the lower levels. - setDozeInFrontAlphaDelayed(mAodFrontScrimOpacity, 30); + setDozeInFrontAlphaDelayed(mAodFrontScrimOpacity, 100); } } }; diff --git a/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java b/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java index b83590979ef7..5ec3dff0043c 100644 --- a/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java +++ b/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java @@ -23,7 +23,7 @@ import android.os.Handler; */ public class DelayedWakeLock implements WakeLock { - private static final long RELEASE_DELAY_MS = 100; + private static final long RELEASE_DELAY_MS = 120; private final Handler mHandler; private final WakeLock mInner; -- cgit v1.2.3-59-g8ed1b