Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 671ef1f0 authored by Ruchi Kandoi's avatar Ruchi Kandoi Committed by Android Git Automerger
Browse files

am 2a894fed: Merge "Display: Brightness: Low power mode scales the brightness to 50 percent." 

* commit '2a894fedba24b816ed930c55f28e857990f6806a':
  Display: Brightness: Low power mode scales the brightness to 50 percent.
parents 9d8e9687 2b3e8568

core/java/android/hardware/display/DisplayManagerInternal.java

+8 −2
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ public abstract class DisplayManagerInternal { 
        // If true, enables automatic brightness control.

        public boolean useAutoBrightness;



        //If true, scales the brightness to half of desired.

        public boolean lowPowerMode;



        // If true, prevents the screen from completely turning on if it is currently off.

        // The display does not enter a "ready" state if this flag is true and screen on is

        // blocked.  The window manager policy blocks screen on while it prepares the keyguard to
@@ -203,6 +206,7 @@ public abstract class DisplayManagerInternal { 
            screenAutoBrightnessAdjustment = other.screenAutoBrightnessAdjustment;

            useAutoBrightness = other.useAutoBrightness;

            blockScreenOn = other.blockScreenOn;

            lowPowerMode = other.lowPowerMode;

        }



        @Override
@@ -218,7 +222,8 @@ public abstract class DisplayManagerInternal { 
                    && screenBrightness == other.screenBrightness

                    && screenAutoBrightnessAdjustment == other.screenAutoBrightnessAdjustment

                    && useAutoBrightness == other.useAutoBrightness

                    && blockScreenOn == other.blockScreenOn;

                    && blockScreenOn == other.blockScreenOn

                    && lowPowerMode == other.lowPowerMode;

        }



        @Override
@@ -233,7 +238,8 @@ public abstract class DisplayManagerInternal { 
                    + ", screenBrightness=" + screenBrightness

                    + ", screenAutoBrightnessAdjustment=" + screenAutoBrightnessAdjustment

                    + ", useAutoBrightness=" + useAutoBrightness

                    + ", blockScreenOn=" + blockScreenOn;

                    + ", blockScreenOn=" + blockScreenOn

                    + ", lowPowerMode=" + lowPowerMode;

        }

    }

services/core/java/com/android/server/display/DisplayPowerController.java

+5 −0
Original line number Diff line number Diff line
@@ -518,6 +518,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                // Brighten quickly.

                slow = false;

            }

            // If low power mode is enabled, brightness level

            // would be scaled down to half

            if (mPowerRequest.lowPowerMode) {

                target = target/2;

            }

            animateScreenBrightness(clampScreenBrightness(target),

                    slow ? BRIGHTNESS_RAMP_RATE_SLOW : BRIGHTNESS_RAMP_RATE_FAST);

        } else {

services/core/java/com/android/server/power/PowerManagerService.java

+2 −0
Original line number Diff line number Diff line
@@ -1634,6 +1634,8 @@ public final class PowerManagerService extends com.android.server.SystemService 


            mDisplayPowerRequest.blockScreenOn = mScreenOnBlocker.isHeld();



            mDisplayPowerRequest.lowPowerMode = mLowPowerModeEnabled;



            mDisplayReady = mDisplayManagerInternal.requestPowerState(mDisplayPowerRequest,

                    mRequestWaitForNegativeProximity);

            mRequestWaitForNegativeProximity = false;