Merge "Animate backlight quickly when display state request to change or power mode changed"

2016-01-12 21:46:38 +00:00
parent a15ef2abab f0cb46cd65
commit 3a87cb0192
1 changed files with 6 additions and 0 deletions
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -673,6 +673,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
                slowChange = false;
            }
            mAppliedDimming = true;
+        } else if (mAppliedDimming) {
+            slowChange = false;
+            mAppliedDimming = false;
        }

        // If low power mode is enabled, cut the brightness level by half
@@ -685,6 +688,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
                slowChange = false;
            }
            mAppliedLowPower = true;
+        } else if (mAppliedLowPower) {
+            slowChange = false;
+            mAppliedLowPower = false;
        }

        // Animate the screen brightness when the screen is on or dozing.