Merge "b/2491823 Fixed brightness toggle for phones w/o auto-brightness"

This commit is contained in:
Erik
2010-03-09 09:40:23 -08:00
committed by Android (Google) Code Review

View File

@@ -435,6 +435,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
brightness = MAXIMUM_BACKLIGHT; brightness = MAXIMUM_BACKLIGHT;
} else { } else {
brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
brightness = MINIMUM_BACKLIGHT;
} }
if (context.getResources().getBoolean( if (context.getResources().getBoolean(
@@ -443,6 +444,9 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
Settings.System.putInt(context.getContentResolver(), Settings.System.putInt(context.getContentResolver(),
Settings.System.SCREEN_BRIGHTNESS_MODE, Settings.System.SCREEN_BRIGHTNESS_MODE,
brightnessMode); brightnessMode);
} else {
// Make sure we set the brightness if automatic mode isn't available
brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
} }
if (brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL) { if (brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL) {
power.setBacklightBrightness(brightness); power.setBacklightBrightness(brightness);