diff options
| author | Michael Lentine <mlentine@google.com> | 2015-09-23 05:19:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-23 05:19:19 +0000 |
| commit | 17a764431a71ff91cbd9272d592fdcd15a9c7539 (patch) | |
| tree | fb96c3262aa18f160663ad8512f1e4e151ef1ff2 /services/core/java/com/android/server/display | |
| parent | 79490dbacd90a851ed8d03d64acedbf3616adba4 (diff) | |
| parent | 193560002fbc080f0006df088f8f5e9c165bfd78 (diff) | |
| download | frameworks_base-17a764431a71ff91cbd9272d592fdcd15a9c7539.zip frameworks_base-17a764431a71ff91cbd9272d592fdcd15a9c7539.tar.gz frameworks_base-17a764431a71ff91cbd9272d592fdcd15a9c7539.tar.bz2 | |
Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev
Diffstat (limited to 'services/core/java/com/android/server/display')
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayPowerController.java | 2 |
1 files changed, 2 insertions, 0 deletions
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 ? |