Merge "Move to DisplayManager brightness APIs" (c84c64a9) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/widget/SettingsAppWidgetProvider.java

+41 −45

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.database.ContentObserver;
		import android.hardware.display.DisplayManager;
		import android.location.LocationManager;
		import android.net.ConnectivityManager;
		import android.net.Uri;
		@@ -736,7 +737,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
		R.drawable.appwidget_settings_ind_on_r_holo);
		} else {
		final int brightness = getBrightness(context);
		final PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
		final PowerManager pm = context.getSystemService(PowerManager.class);
		// Set the icon
		final int full = (int)(pm.getMaximumScreenBrightnessSetting()
		* FULL_BRIGHTNESS_THRESHOLD);
		@@ -872,10 +873,8 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
		*/
		private void toggleBrightness(Context context) {
		try {
		IPowerManager power = IPowerManager.Stub.asInterface(
		ServiceManager.getService("power"));
		if (power != null) {
		PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
		DisplayManager dm = context.getSystemService(DisplayManager.class);
		PowerManager pm = context.getSystemService(PowerManager.class);

		ContentResolver cr = context.getContentResolver();
		int brightness = Settings.System.getInt(cr,
		@@ -913,12 +912,9 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
		brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
		}
		if (brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL) {
		power.setTemporaryScreenBrightnessSettingOverride(brightness);
		dm.setTemporaryBrightness(brightness);
		Settings.System.putInt(cr, Settings.System.SCREEN_BRIGHTNESS, brightness);
		}
		}
		} catch (RemoteException e) {
		Log.d(TAG, "toggleBrightness: " + e);
		} catch (Settings.SettingNotFoundException e) {
		Log.d(TAG, "toggleBrightness: " + e);
		}