1 files changed, 29 insertions, 39 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/BrightnessButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/BrightnessButton.java
index 4968d6d..c4f5cdc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/BrightnessButton.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/BrightnessButton.java
@@ -7,8 +7,8 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.IPowerManager;
 import android.os.Power;
+import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.preference.MultiSelectListPreference;
@@ -79,12 +79,12 @@ public class BrightnessButton extends PowerButton {
             Context context = mView.getContext();
             mAutoBrightnessSupported = context.getResources().getBoolean(
                     com.android.internal.R.bool.config_automatic_brightness_available);
-            updateSettings();
+            updateSettings(context.getContentResolver());
         }
     }
 
     @Override
-    protected void updateState() {
+    protected void updateState(Context context) {
         if (mAutoBrightness) {
             mIcon = R.drawable.stat_brightness_auto;
             mState = STATE_ENABLED;
@@ -101,42 +101,37 @@ public class BrightnessButton extends PowerButton {
     }
 
     @Override
-    protected void toggleState() {
-        try {
-            IPowerManager power = IPowerManager.Stub
-                    .asInterface(ServiceManager.getService("power"));
-            if (power != null) {
-                ContentResolver resolver = mView.getContext().getContentResolver();
-                mCurrentBacklightIndex++;
-                if (mCurrentBacklightIndex > mBacklightValues.length - 1) {
-                    mCurrentBacklightIndex = 0;
-                }
-                int backlightIndex = mBacklightValues[mCurrentBacklightIndex];
-                int brightness = BACKLIGHTS[backlightIndex];
-                if (brightness == AUTO_BACKLIGHT) {
-                    Settings.System.putInt(resolver, Settings.System.SCREEN_BRIGHTNESS_MODE,
-                            Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
-                } else {
-                    if (mAutoBrightnessSupported) {
-                        Settings.System.putInt(resolver, Settings.System.SCREEN_BRIGHTNESS_MODE,
-                                Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
-                    }
-                    power.setBacklightBrightness(brightness);
-                    Settings.System.putInt(resolver, Settings.System.SCREEN_BRIGHTNESS, brightness);
-                }
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "toggleState()", e);
+    protected void toggleState(Context context) {
+        PowerManager power = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+        ContentResolver resolver = context.getContentResolver();
+
+        mCurrentBacklightIndex++;
+        if (mCurrentBacklightIndex > mBacklightValues.length - 1) {
+            mCurrentBacklightIndex = 0;
         }
 
+        int backlightIndex = mBacklightValues[mCurrentBacklightIndex];
+        int brightness = BACKLIGHTS[backlightIndex];
+
+        if (brightness == AUTO_BACKLIGHT) {
+            Settings.System.putInt(resolver, Settings.System.SCREEN_BRIGHTNESS_MODE,
+                    Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
+        } else {
+            if (mAutoBrightnessSupported) {
+                Settings.System.putInt(resolver, Settings.System.SCREEN_BRIGHTNESS_MODE,
+                        Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
+            }
+            power.setBacklightBrightness(brightness);
+            Settings.System.putInt(resolver, Settings.System.SCREEN_BRIGHTNESS, brightness);
+        }
     }
 
     @Override
-    protected boolean handleLongClick() {
+    protected boolean handleLongClick(Context context) {
         Intent intent = new Intent("android.settings.DISPLAY_SETTINGS");
         intent.addCategory(Intent.CATEGORY_DEFAULT);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mView.getContext().startActivity(intent);
+        context.startActivity(intent);
         return true;
     }
 
@@ -146,8 +141,7 @@ public class BrightnessButton extends PowerButton {
     }
 
     @Override
-    protected void onChangeUri(Uri uri) {
-        ContentResolver resolver = mView.getContext().getContentResolver();
+    protected void onChangeUri(ContentResolver resolver, Uri uri) {
         if (BRIGHTNESS_URI.equals(uri)) {
             mCurrentBrightness = Settings.System.getInt(resolver,
                     Settings.System.SCREEN_BRIGHTNESS, 0);
@@ -155,13 +149,11 @@ public class BrightnessButton extends PowerButton {
             mAutoBrightness = (Settings.System.getInt(resolver,
                     Settings.System.SCREEN_BRIGHTNESS_MODE, 0) == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
         } else {
-            updateSettings();
+            updateSettings(resolver);
         }
     }
 
-    private void updateSettings() {
-        ContentResolver resolver = mView.getContext().getContentResolver();
-
+    private void updateSettings(ContentResolver resolver) {
         boolean lightSensorCustom = (Settings.System.getInt(resolver,
                 Settings.System.LIGHT_SENSOR_CUSTOM, 0) != 0);
         if (lightSensorCustom) {
@@ -198,7 +190,5 @@ public class BrightnessButton extends PowerButton {
                 }
             }
         }
-        updateState();
     }
-
 }