From 193560002fbc080f0006df088f8f5e9c165bfd78 Mon Sep 17 00:00:00 2001 From: Michael Lentine Date: Tue, 22 Sep 2015 13:02:22 -0700 Subject: Dismiss color fade when it is no longer used. Previously the color fade layers would stay active until the screen was turned back on. After this change, the layers are dismissed as soon as color fade completes. Bug: 24276564 Change-Id: I1f81b397d82d518c2bc921b22f7fe9fd066fc059 --- .../core/java/com/android/server/display/DisplayPowerController.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'services') diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 452378f..533f425 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -837,6 +837,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call if (mPendingScreenOff && target != Display.STATE_OFF) { setScreenState(Display.STATE_OFF); mPendingScreenOff = false; + mPowerState.dismissColorFade(); } if (target == Display.STATE_ON) { @@ -910,6 +911,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // A black surface is already hiding the contents of the screen. setScreenState(Display.STATE_OFF); mPendingScreenOff = false; + mPowerState.dismissColorFade(); } else if (performScreenOffTransition && mPowerState.prepareColorFade(mContext, mColorFadeFadesConfig ? -- cgit v1.1