1 files changed, 28 insertions, 30 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/ScreenTimeoutButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/ScreenTimeoutButton.java
index acac53e..632e16a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/ScreenTimeoutButton.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/ScreenTimeoutButton.java
@@ -26,7 +26,7 @@ public class ScreenTimeoutButton extends PowerButton {
     private static final int CM_MODE_15_60_300 = 0;
     private static final int CM_MODE_30_120_300 = 1;
 
-    private static Toast TOAST = null;
+    private Toast mToast = null;
 
     private static final List<Uri> OBSERVED_URIS = new ArrayList<Uri>();
     static {
@@ -37,7 +37,7 @@ public class ScreenTimeoutButton extends PowerButton {
 
     @Override
     protected void updateState() {
-        int timeout=getScreenTtimeout(mView.getContext());
+        int timeout = getScreenTimeout(mView.getContext());
 
         if (timeout <= SCREEN_TIMEOUT_LOW) {
             mIcon = R.drawable.stat_screen_timeout_off;
@@ -54,57 +54,55 @@ public class ScreenTimeoutButton extends PowerButton {
     @Override
     protected void toggleState() {
         Context context = mView.getContext();
-        int screentimeout = getScreenTtimeout(context);
+        int screenTimeout = getScreenTimeout(context);
         int currentMode = getCurrentCMMode(context);
 
-        if (screentimeout < SCREEN_TIMEOUT_MIN) {
+        if (screenTimeout < SCREEN_TIMEOUT_MIN) {
             if (currentMode == CM_MODE_15_60_300) {
-                screentimeout = SCREEN_TIMEOUT_MIN;
+                screenTimeout = SCREEN_TIMEOUT_MIN;
             } else {
-                screentimeout = SCREEN_TIMEOUT_LOW;
+                screenTimeout = SCREEN_TIMEOUT_LOW;
             }
-        } else if (screentimeout < SCREEN_TIMEOUT_LOW) {
+        } else if (screenTimeout < SCREEN_TIMEOUT_LOW) {
             if (currentMode == CM_MODE_15_60_300) {
-                screentimeout = SCREEN_TIMEOUT_NORMAL;
+                screenTimeout = SCREEN_TIMEOUT_NORMAL;
             } else {
-                screentimeout = SCREEN_TIMEOUT_LOW;
+                screenTimeout = SCREEN_TIMEOUT_LOW;
             }
-        } else if (screentimeout < SCREEN_TIMEOUT_NORMAL) {
+        } else if (screenTimeout < SCREEN_TIMEOUT_NORMAL) {
             if (currentMode == CM_MODE_15_60_300) {
-                screentimeout = SCREEN_TIMEOUT_NORMAL;
+                screenTimeout = SCREEN_TIMEOUT_NORMAL;
             } else {
-                screentimeout = SCREEN_TIMEOUT_HIGH;
+                screenTimeout = SCREEN_TIMEOUT_HIGH;
             }
-        } else if (screentimeout < SCREEN_TIMEOUT_HIGH) {
+        } else if (screenTimeout < SCREEN_TIMEOUT_HIGH) {
             if (currentMode == CM_MODE_15_60_300) {
-                screentimeout = SCREEN_TIMEOUT_MAX;
+                screenTimeout = SCREEN_TIMEOUT_MAX;
             } else {
-                screentimeout = SCREEN_TIMEOUT_HIGH;
+                screenTimeout = SCREEN_TIMEOUT_HIGH;
             }
-        } else if (screentimeout < SCREEN_TIMEOUT_MAX) {
-            screentimeout = SCREEN_TIMEOUT_MAX;
+        } else if (screenTimeout < SCREEN_TIMEOUT_MAX) {
+            screenTimeout = SCREEN_TIMEOUT_MAX;
         } else if (currentMode == CM_MODE_30_120_300) {
-            screentimeout = SCREEN_TIMEOUT_LOW;
+            screenTimeout = SCREEN_TIMEOUT_LOW;
         } else {
-            screentimeout = SCREEN_TIMEOUT_MIN;
+            screenTimeout = SCREEN_TIMEOUT_MIN;
         }
 
         Settings.System.putInt(
                 context.getContentResolver(),
-                Settings.System.SCREEN_OFF_TIMEOUT, screentimeout);
-
-        // create our toast
-        if(TOAST == null) {
-            TOAST = Toast.makeText(context, "", Toast.LENGTH_LONG);
-        }
+                Settings.System.SCREEN_OFF_TIMEOUT, screenTimeout);
 
         // cancel any previous toast
-        TOAST.cancel();
+        if (mToast != null) {
+            mToast.cancel();
+        }
 
         // inform users of how long the timeout is now
-        TOAST.setText("Screen timeout set to: " + timeoutToString(screentimeout));
-        TOAST.setGravity(Gravity.CENTER, TOAST.getXOffset() / 2, TOAST.getYOffset() / 2);
-        TOAST.show();
+        mToast = Toast.makeText(context, "Screen timeout set to: " + timeoutToString(screenTimeout),
+                Toast.LENGTH_LONG);
+        mToast.setGravity(Gravity.CENTER, mToast.getXOffset() / 2, mToast.getYOffset() / 2);
+        mToast.show();
     }
 
     @Override
@@ -121,7 +119,7 @@ public class ScreenTimeoutButton extends PowerButton {
         return true;
     }
 
-    private static int getScreenTtimeout(Context context) {
+    private static int getScreenTimeout(Context context) {
         return Settings.System.getInt(
                 context.getContentResolver(),
                 Settings.System.SCREEN_OFF_TIMEOUT, 0);