PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deal correctly with an unset brightness adjustment.

Browse Source 
Change-Id: I191051989bad68f31210bbc717fbabd59d4585a1
This commit is contained in:
Dianne Hackborn
2012-04-23 18:22:13 -07:00
parent f1e26a1bb3
commit 704cc2f600
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/BrightnessPreference.java
View File

@@ -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);
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);
}
} catch (SettingNotFoundException snfe) {
}
return (int)(brightness*10000);
}