diff options
author | Jeff Brown <jeffbrown@google.com> | 2012-04-30 16:19:46 -0700 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2012-04-30 16:19:46 -0700 |
commit | 829c79961c71f5bc96673afbbe1a91ad1a5dda25 (patch) | |
tree | b46e87ced19ca36189ef06c37f4640f0b516ab79 /src/com/android/settings/BrightnessPreference.java | |
parent | d6d65741f98db6db62564d94ab36107880755b0c (diff) | |
download | packages_apps_Settings-829c79961c71f5bc96673afbbe1a91ad1a5dda25.zip packages_apps_Settings-829c79961c71f5bc96673afbbe1a91ad1a5dda25.tar.gz packages_apps_Settings-829c79961c71f5bc96673afbbe1a91ad1a5dda25.tar.bz2 |
Fix manual brightness adjustment.
getBrightness() was calculating the brightness ratio the wrong
way, resulting in brightness fractions always greater than 1.0
being produced (maximum brightness).
Bug: 6377115
Change-Id: Ia2fbae505ffdc382005722d25301bfb689b585fb
Diffstat (limited to 'src/com/android/settings/BrightnessPreference.java')
-rw-r--r-- | src/com/android/settings/BrightnessPreference.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java index e015914..9023ea3 100644 --- a/src/com/android/settings/BrightnessPreference.java +++ b/src/com/android/settings/BrightnessPreference.java @@ -55,6 +55,8 @@ public class BrightnessPreference extends SeekBarDialogPreference implements getContext().getResources().getInteger(com.android.internal.R.integer.config_screenBrightnessDim); private static final int MAXIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_ON; + private static final int SEEK_BAR_RANGE = 10000; + private ContentObserver mBrightnessObserver = new ContentObserver(new Handler()) { @Override public void onChange(boolean selfChange) { @@ -98,7 +100,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements super.onBindDialogView(view); mSeekBar = getSeekBar(view); - mSeekBar.setMax(10000); + mSeekBar.setMax(SEEK_BAR_RANGE); mOldBrightness = getBrightness(); mSeekBar.setProgress(mOldBrightness); @@ -141,11 +143,10 @@ public class BrightnessPreference extends SeekBarDialogPreference implements } else { brightness = Settings.System.getInt(getContext().getContentResolver(), Settings.System.SCREEN_BRIGHTNESS, 100); - brightness = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim) - / (brightness - mScreenBrightnessDim); - + brightness = (brightness - mScreenBrightnessDim) + / (MAXIMUM_BACKLIGHT - mScreenBrightnessDim); } - return (int)(brightness*10000); + return (int)(brightness*SEEK_BAR_RANGE); } private int getBrightnessMode(int defaultValue) { @@ -197,7 +198,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements private void setBrightness(int brightness, boolean write) { if (mAutomaticMode) { - float valf = (((float)brightness*2)/10000) - 1.0f; + float valf = (((float)brightness*2)/SEEK_BAR_RANGE) - 1.0f; try { IPowerManager power = IPowerManager.Stub.asInterface( ServiceManager.getService("power")); @@ -213,7 +214,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements } } else { int range = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim); - brightness = (brightness*range)/10000 + mScreenBrightnessDim; + brightness = (brightness*range)/SEEK_BAR_RANGE + mScreenBrightnessDim; try { IPowerManager power = IPowerManager.Stub.asInterface( ServiceManager.getService("power")); |