diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-16 12:29:15 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-16 12:29:15 -0400 |
| commit | f55aa972f9911c6aafc9fbdb736bdec11e004542 (patch) | |
| tree | d4d21e41c1a633672e1bd520f5fcd69599bb674a /core | |
| parent | 39e6773431e6010c5066c0e13facfd943c932c7e (diff) | |
| parent | dc3494e3d8e17aeb0dbbe41953a5ef763d95ff78 (diff) | |
| download | frameworks_base-f55aa972f9911c6aafc9fbdb736bdec11e004542.zip frameworks_base-f55aa972f9911c6aafc9fbdb736bdec11e004542.tar.gz frameworks_base-f55aa972f9911c6aafc9fbdb736bdec11e004542.tar.bz2 | |
Merge change I01935be3 into eclair
* changes:
Remove PowerManager.setAutoBrightness()
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/os/IPowerManager.aidl | 3 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index 189335e..5ac543d 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/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); } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 8c9581d..cb3dc16 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1081,6 +1081,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. */ public static final String SHOW_PROCESSES = "show_processes"; |