am ea7f30ff: am 5928da68: Merge change 27471 into eclair

Merge commit 'ea7f30ffc426e0b251384778b64271261ca82b4c'

* commit 'ea7f30ffc426e0b251384778b64271261ca82b4c':
  Fix power widget brightness for Sholes.
This commit is contained in:
Ken Shirriff
2009-09-28 11:42:15 -07:00
committed by Android Git Automerger

View File

@@ -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);