Merge "Make the screen brightness setting limits configurable." into jb-mr1-dev

Author: Jeff Brown

core/java/android/os/PowerManager.java

@@ -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 PowerManager(Context context, IPowerManager service, Handler handler) {
      */
     public int getMinimumScreenBrightnessSetting() {
         return mContext.getResources().getInteger(
-                com.android.internal.R.integer.config_screenBrightnessDim);
+                com.android.internal.R.integer.config_screenBrightnessSettingMinimum);
     }
 
     /**
@@ -331,15 +324,17 @@ public int getMinimumScreenBrightnessSetting() {
      * @hide
      */
     public int getMaximumScreenBrightnessSetting() {
-        return BRIGHTNESS_ON;
+        return mContext.getResources().getInteger(
+                com.android.internal.R.integer.config_screenBrightnessSettingMaximum);
     }
 
     /**
      * Gets the default screen brightness setting.
      * @hide
      */
     public int getDefaultScreenBrightnessSetting() {
-        return BRIGHTNESS_DEFAULT;
+        return mContext.getResources().getInteger(
+                com.android.internal.R.integer.config_screenBrightnessSettingDefault);
     }
 
     /**

core/res/res/values/config.xml

@@ -554,9 +554,22 @@
     <integer-array name="config_autoBrightnessLevels">
     </integer-array>
 
-
-    <!-- Minimum screen brightness allowed by the power manager. -->
-    <integer name="config_screenBrightnessDim">20</integer>
+    <!-- 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>
+
+    <!-- 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

core/res/res/values/public.xml

@@ -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" />