Merge "Follow up for "A better auto brightness""
diff --git a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java
index c0a07e9..a770f58 100644
--- a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java
+++ b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java
@@ -193,7 +193,7 @@
             }
         } else {
             final float adj = value / (BRIGHTNESS_ADJ_RESOLUTION / 2f) - 1;
-            setBrignessAdj(adj);
+            setBrightnessAdj(adj);
             if (!tracking) {
                 AsyncTask.execute(new Runnable() {
                     public void run() {
@@ -223,7 +223,7 @@
         }
     }
 
-    private void setBrignessAdj(float adj) {
+    private void setBrightnessAdj(float adj) {
         try {
             mPower.setTemporaryScreenAutoBrightnessAdjustmentSettingOverride(adj);
         } catch (RemoteException ex) {
@@ -246,7 +246,7 @@
                     Settings.System.SCREEN_BRIGHTNESS_MODE,
                     Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL,
                     UserHandle.USER_CURRENT);
-            mAutomatic = automatic != 0;
+            mAutomatic = automatic != Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
             updateIcon(mAutomatic);
         } else {
             mControl.setChecked(false);