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

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

Browse Source 
* commit '7e68e923058295b5b0b789f00cf66d0a289e2115':
  Make the screen brightness setting limits configurable.
This commit is contained in:
Jeff Brown
2012-08-21 23:23:06 -07:00
committed by Android Git Automerger
parent 128e527ffc 7e68e92305
commit 76a855f0e2
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);
}
/**