diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-28 14:27:15 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-28 14:27:15 -0400 |
| commit | 5928da682a31f3375a206d551c478d76437bb7cf (patch) | |
| tree | 291af0c673b01d4fdbf41d9c7ef7c78a8ad6aa36 /src | |
| parent | afa9d6ea321228add087f753e1e2a3853150d56f (diff) | |
| parent | c4a0576473bd14eec1307ae1e0001a1db4fb5e94 (diff) | |
| download | packages_apps_settings-5928da682a31f3375a206d551c478d76437bb7cf.zip packages_apps_settings-5928da682a31f3375a206d551c478d76437bb7cf.tar.gz packages_apps_settings-5928da682a31f3375a206d551c478d76437bb7cf.tar.bz2 | |
Merge change 27471 into eclair
* changes:
Fix power widget brightness for Sholes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/widget/SettingsAppWidgetProvider.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java index ab77b05..37896bf 100644 --- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java +++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java @@ -390,8 +390,14 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { } power.setBacklightBrightness(brightness); Settings.System.putInt(cr, Settings.System.SCREEN_BRIGHTNESS, brightness); - brightness = Settings.System.getInt(cr, - Settings.System.SCREEN_BRIGHTNESS); + if (context.getResources().getBoolean( + com.android.internal.R.bool.config_automatic_brightness_available)) { + // Disable automatic brightness + power.setAutoBrightness(false); + Settings.System.putInt(context.getContentResolver(), + Settings.System.SCREEN_BRIGHTNESS_MODE, + 0); + } } } catch (RemoteException e) { Log.d(TAG, "toggleBrightness: " + e); |