diff options
| author | Ruchi Kandoi <kandoiruchi@google.com> | 2014-05-09 22:26:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 22:26:14 +0000 |
| commit | 671ef1f0db7f0f92beb5c24eb3960d6374f42864 (patch) | |
| tree | 133fee4eb2d3a3302d46f4126323f2d9e4be4ef3 /core | |
| parent | 9d8e968789da2ce70e9c1129be6d28fc1191cbf0 (diff) | |
| parent | 2b3e85683d7b69a08bf7e743815f335304de5103 (diff) | |
| download | frameworks_base-671ef1f0db7f0f92beb5c24eb3960d6374f42864.zip frameworks_base-671ef1f0db7f0f92beb5c24eb3960d6374f42864.tar.gz frameworks_base-671ef1f0db7f0f92beb5c24eb3960d6374f42864.tar.bz2 | |
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.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/hardware/display/DisplayManagerInternal.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/hardware/display/DisplayManagerInternal.java b/core/java/android/hardware/display/DisplayManagerInternal.java index cec90cd..e58c54d 100644 --- a/core/java/android/hardware/display/DisplayManagerInternal.java +++ b/core/java/android/hardware/display/DisplayManagerInternal.java @@ -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; } } |