am 2086152c: am f55aa972: Merge change I01935be3 into eclair

Merge commit '2086152c1b60ad3bfe85c1ddc3871cff77e6da1b' into eclair-mr2-plus-aosp

* commit '2086152c1b60ad3bfe85c1ddc3871cff77e6da1b':
  Remove PowerManager.setAutoBrightness()

core/java/android/os/IPowerManager.aidl

@@ -34,7 +34,4 @@ interface IPowerManager
 
     // sets the brightness of the backlights (screen, keyboard, button) 0-255
     void setBacklightBrightness(int brightness);
-
-    // enables or disables automatic brightness mode
-    void setAutoBrightness(boolean on);
 }

core/java/android/provider/Settings.java

@@ -1080,6 +1080,18 @@ public final class Settings {
          */
         public static final String SCREEN_BRIGHTNESS_MODE = "screen_brightness_mode";
 
+        /**
+         * SCREEN_BRIGHTNESS_MODE value for manual mode.
+         * @hide
+         */
+        public static final int SCREEN_BRIGHTNESS_MODE_MANUAL = 0;
+
+        /**
+         * SCREEN_BRIGHTNESS_MODE value for manual mode.
+         * @hide
+         */
+        public static final int SCREEN_BRIGHTNESS_MODE_AUTOMATIC = 1;
+
         /**
          * Control whether the process CPU usage meter should be shown.
          */