Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 11167b88: Merge "Make the screen brightness setting limits configurable." into jb-mr1-dev

Browse Source 
* commit '11167b887aa2af52b861f5ffd31efa0882c80ec5':
  Make the screen brightness setting limits configurable.
This commit is contained in:
Jeff Brown
2012-08-21 23:21:14 -07:00
committed by Android Git Automerger
parent 64ce3396db 11167b887a
commit 7e68e92305
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/os/PowerManager.java
View File

@@ -239,13 +239,6 @@ public final class PowerManager {
*/
public static final int BRIGHTNESS_OFF = 0;
/**
* A nominal default brightness value.
* Use {@link #getDefaultScreenBrightnessSetting()} instead.
* @hide
*/
private static final int BRIGHTNESS_DEFAULT = 102;
// Note: Be sure to update android.os.BatteryStats and PowerManager.h
// if adding or modifying user activity event constants.
@@ -321,7 +314,7 @@ public final class PowerManager {
*/
public int getMinimumScreenBrightnessSetting() {
return mContext.getResources().getInteger(
com.android.internal.R.integer.config_screenBrightnessDim);
com.android.internal.R.integer.config_screenBrightnessSettingMinimum);
}
/**
@@ -331,7 +324,8 @@ public final class PowerManager {
* @hide
*/
public int getMaximumScreenBrightnessSetting() {
return BRIGHTNESS_ON;
return mContext.getResources().getInteger(
com.android.internal.R.integer.config_screenBrightnessSettingMaximum);
}
/**
@@ -339,7 +333,8 @@ public final class PowerManager {
* @hide
*/
public int getDefaultScreenBrightnessSetting() {
return BRIGHTNESS_DEFAULT;
return mContext.getResources().getInteger(
com.android.internal.R.integer.config_screenBrightnessSettingDefault);
}
/**

17
core/res/res/values/config.xml
View File

@@ -554,9 +554,22 @@
<integer-array name="config_autoBrightnessLevels">
</integer-array>
<!-- Minimum screen brightness setting allowed by the power manager.
The user is forbidden from setting the brightness below this level. -->
<integer name="config_screenBrightnessSettingMinimum">10</integer>
<!-- Minimum screen brightness allowed by the power manager. -->
<integer name="config_screenBrightnessDim">20</integer>
<!-- Maximum screen brightness allowed by the power manager.
The user is forbidden from setting the brightness above this level. -->
<integer name="config_screenBrightnessSettingMaximum">255</integer>
<!-- Default screen brightness setting.
Must be in the range specified by minimum and maximum. -->
<integer name="config_screenBrightnessSettingDefault">102</integer>
<!-- Screen brightness used to dim the screen when the user activity
timeout expires. May be less than the minimum allowed brightness setting
that can be set by the user. -->
<integer name="config_screenBrightnessDim">10</integer>
<!-- Array of output values for LCD backlight corresponding to the LUX values
in the config_autoBrightnessLevels array. This array should have size one greater

3
core/res/res/values/public.xml
View File

@@ -1471,6 +1471,9 @@
<java-symbol type="integer" name="config_notificationsBatteryLowARGB" />
<java-symbol type="integer" name="config_notificationsBatteryMediumARGB" />
<java-symbol type="integer" name="config_radioScanningTimeout" />
<java-symbol type="integer" name="config_screenBrightnessSettingMinimum" />
<java-symbol type="integer" name="config_screenBrightnessSettingMaximum" />
<java-symbol type="integer" name="config_screenBrightnessSettingDefault" />
<java-symbol type="integer" name="config_screenBrightnessDim" />
<java-symbol type="integer" name="config_virtualKeyQuietTimeMillis" />
<java-symbol type="layout" name="am_compat_mode_dialog" />