diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-09 16:30:49 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2012-05-09 16:30:49 -0700 |
| commit | 518a3d82f78e5089d0f99e61e46e1e915aea91ab (patch) | |
| tree | 2a424254302c5423cb6d3dc584070006f01763d9 | |
| parent | a53de0629f3b94472c0f160f5bbe1090b020feab (diff) | |
| download | frameworks_base-518a3d82f78e5089d0f99e61e46e1e915aea91ab.zip frameworks_base-518a3d82f78e5089d0f99e61e46e1e915aea91ab.tar.gz frameworks_base-518a3d82f78e5089d0f99e61e46e1e915aea91ab.tar.bz2 | |
Remove auto-brightness adjustment knob.
Not yet ready for release.
Change-Id: I75bc87f35af47c6baac1f26953d8bf3e38062c92
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 1 | ||||
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index bdb332e..8670217 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18410,7 +18410,6 @@ package android.provider { field public static final java.lang.String RADIO_NFC = "nfc"; field public static final java.lang.String RADIO_WIFI = "wifi"; field public static final java.lang.String RINGTONE = "ringtone"; - field public static final java.lang.String SCREEN_AUTO_BRIGHTNESS_ADJ = "screen_auto_brightness_adj"; field public static final java.lang.String SCREEN_BRIGHTNESS = "screen_brightness"; field public static final java.lang.String SCREEN_BRIGHTNESS_MODE = "screen_brightness_mode"; field public static final int SCREEN_BRIGHTNESS_MODE_AUTOMATIC = 1; // 0x1 diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ba8c4c9..497e66e8 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1410,6 +1410,7 @@ public final class Settings { /** * Adjustment to auto-brightness to make it generally more (>0.0 <1.0) * or less (<0.0 >-1.0) bright. + * @hide */ public static final String SCREEN_AUTO_BRIGHTNESS_ADJ = "screen_auto_brightness_adj"; diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index 5799f2b..289ab2a 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -485,7 +485,7 @@ public class PowerManagerService extends IPowerManager.Stub //mDimScreen = getInt(DIM_SCREEN) != 0; mScreenBrightnessSetting = getInt(SCREEN_BRIGHTNESS, DEFAULT_SCREEN_BRIGHTNESS); - mLightSensorAdjustSetting = getFloat(SCREEN_AUTO_BRIGHTNESS_ADJ, 0); + mLightSensorAdjustSetting = 0; //getFloat(SCREEN_AUTO_BRIGHTNESS_ADJ, 0); // SCREEN_BRIGHTNESS_MODE, default to manual setScreenBrightnessMode(getInt(SCREEN_BRIGHTNESS_MODE, @@ -649,7 +649,7 @@ public class PowerManagerService extends IPowerManager.Stub + Settings.System.NAME + "=?) or (" + Settings.System.NAME + "=?)", new String[]{STAY_ON_WHILE_PLUGGED_IN, SCREEN_OFF_TIMEOUT, DIM_SCREEN, SCREEN_BRIGHTNESS, - SCREEN_BRIGHTNESS_MODE, SCREEN_AUTO_BRIGHTNESS_ADJ, + SCREEN_BRIGHTNESS_MODE, /*SCREEN_AUTO_BRIGHTNESS_ADJ,*/ WINDOW_ANIMATION_SCALE, TRANSITION_ANIMATION_SCALE}, null); mSettings = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, mHandler); |