diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-04-23 18:55:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-23 18:55:32 -0700 |
| commit | 3e9263a9721faf37599b9fd7765685804c1aeb0f (patch) | |
| tree | b65d6aed38eb15748656e3360948494194469fc5 | |
| parent | b3a593eb766ed499274202db0b817f710c09b8b0 (diff) | |
| parent | 704cc2f600c8d754efe25d3672dcd773cc16c49f (diff) | |
| download | packages_apps_Settings-3e9263a9721faf37599b9fd7765685804c1aeb0f.zip packages_apps_Settings-3e9263a9721faf37599b9fd7765685804c1aeb0f.tar.gz packages_apps_Settings-3e9263a9721faf37599b9fd7765685804c1aeb0f.tar.bz2 | |
Merge "Deal correctly with an unset brightness adjustment."
| -rw-r--r-- | src/com/android/settings/BrightnessPreference.java | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java index fb25e9b..e015914 100644 --- a/src/com/android/settings/BrightnessPreference.java +++ b/src/com/android/settings/BrightnessPreference.java @@ -134,19 +134,16 @@ public class BrightnessPreference extends SeekBarDialogPreference implements private int getBrightness() { int mode = getBrightnessMode(0); float brightness = 0; - try { - if (mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) { - brightness = Settings.System.getFloat(getContext().getContentResolver(), - Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ); - brightness = (brightness+1)/2; - } else { - brightness = Settings.System.getInt(getContext().getContentResolver(), - Settings.System.SCREEN_BRIGHTNESS); - brightness = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim) - / (brightness - mScreenBrightnessDim); - - } - } catch (SettingNotFoundException snfe) { + if (mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) { + brightness = Settings.System.getFloat(getContext().getContentResolver(), + Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0); + brightness = (brightness+1)/2; + } else { + brightness = Settings.System.getInt(getContext().getContentResolver(), + Settings.System.SCREEN_BRIGHTNESS, 100); + brightness = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim) + / (brightness - mScreenBrightnessDim); + } return (int)(brightness*10000); } |