Fix dock battery tile display.

Change-Id: I624663149da1161c2cd4f4b20b388bd711d9883c

2 files changed, 17 insertions, 8 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
index c27b8cc..56cad64 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
@@ -120,7 +120,7 @@ public class BatteryController extends BroadcastReceiver {
     public void addStateChangedCallback(BatteryStateChangeCallback cb) {
         mChangeCallbacks.add(cb);
         // trigger initial update
-        cb.onBatteryLevelChanged(mBatteryLevel, isBatteryStatusCharging());
+        cb.onBatteryLevelChanged(getBatteryLevel(), isBatteryStatusCharging());
     }
 
     public void removeStateChangedCallback(BatteryStateChangeCallback cb) {
@@ -144,6 +144,10 @@ public class BatteryController extends BroadcastReceiver {
         return R.drawable.stat_sys_battery_charge_min;
     }
 
+    protected int getBatteryLevel() {
+        return mBatteryLevel;
+    }
+
     protected int getBatteryStyle() {
         return mBatteryStyle;
     }
@@ -188,24 +192,24 @@ public class BatteryController extends BroadcastReceiver {
     }
 
     protected void updateViews() {
+        int level = getBatteryLevel();
         if (mUiController) {
             int N = mIconViews.size();
             for (int i=0; i<N; i++) {
                 ImageView v = mIconViews.get(i);
-                v.setImageLevel(mBatteryLevel);
+                v.setImageLevel(level);
                 v.setContentDescription(mContext.getString(R.string.accessibility_battery_level,
-                        mBatteryLevel));
+                        level));
             }
             N = mLabelViews.size();
             for (int i=0; i<N; i++) {
                 TextView v = mLabelViews.get(i);
-                v.setText(mContext.getString(BATTERY_TEXT_STYLE_MIN,
-                        mBatteryLevel));
+                v.setText(mContext.getString(BATTERY_TEXT_STYLE_MIN, level));
             }
         }
 
         for (BatteryStateChangeCallback cb : mChangeCallbacks) {
-            cb.onBatteryLevelChanged(mBatteryLevel, isBatteryStatusCharging());
+            cb.onBatteryLevelChanged(level, isBatteryStatusCharging());
         }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DockBatteryController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DockBatteryController.java
index 8ec40ca..cde5e2c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DockBatteryController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DockBatteryController.java
@@ -62,7 +62,7 @@ public class DockBatteryController extends BatteryController {
         }
 
         for (DockBatteryStateChangeCallback cb : mChangeCallbacks) {
-            cb.onDockBatteryLevelChanged(mBatteryLevel, isBatteryPresent(), isBatteryStatusCharging());
+            cb.onDockBatteryLevelChanged(getBatteryLevel(), isBatteryPresent(), isBatteryStatusCharging());
         }
     }
 
@@ -76,7 +76,7 @@ public class DockBatteryController extends BatteryController {
     public void addStateChangedCallback(DockBatteryStateChangeCallback cb) {
         mChangeCallbacks.add(cb);
         // trigger initial update
-        cb.onDockBatteryLevelChanged(mBatteryLevel, isBatteryPresent(), isBatteryStatusCharging());
+        cb.onDockBatteryLevelChanged(getBatteryLevel(), isBatteryPresent(), isBatteryStatusCharging());
     }
 
     public void removeStateChangedCallback(DockBatteryStateChangeCallback cb) {
@@ -105,6 +105,11 @@ public class DockBatteryController extends BatteryController {
     }
 
     @Override
+    protected int getBatteryLevel() {
+        return mBatteryLevel;
+    }
+
+    @Override
     protected int getBatteryStatus() {
         return mDockBatteryStatus;
     }