1 files changed, 11 insertions, 18 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CircleDockBattery.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CircleDockBattery.java
index dba10b8..b0fe80a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CircleDockBattery.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CircleDockBattery.java
@@ -34,11 +34,11 @@ import com.android.systemui.R;
  * @see CircleBattery
  */
 
-public class CircleDockBattery extends CircleBattery {
+public class CircleDockBattery extends CircleBattery
+        implements DockBatteryController.DockBatteryStateChangeCallback {
 
     private int mLevel;
     private int mDockBatteryStatus = BatteryManager.BATTERY_STATUS_UNKNOWN;
-    private boolean mBatteryPlugged = false;
     private boolean mBatteryPresent = false;
 
     private final Context mContext;
@@ -94,18 +94,21 @@ public class CircleDockBattery extends CircleBattery {
     }
 
     @Override
-    protected int getLevel() {
-        return mLevel;
+    public void onDockBatteryLevelChanged(int level, boolean present, int status) {
+        mLevel = level;
+        mBatteryPresent = present;
+        mDockBatteryStatus = status;
+        updateVisibility();
     }
 
     @Override
-    protected int getBatteryStatus() {
-        return mDockBatteryStatus;
+    protected int getBatteryLevel() {
+        return mLevel;
     }
 
     @Override
-    protected boolean isBatteryPlugged() {
-        return mBatteryPlugged;
+    protected int getBatteryStatus() {
+        return mDockBatteryStatus;
     }
 
     @Override
@@ -114,16 +117,6 @@ public class CircleDockBattery extends CircleBattery {
     }
 
     @Override
-    protected void onBatteryStatusChange(Intent intent) {
-        mLevel = intent.getIntExtra(BatteryManager.EXTRA_DOCK_LEVEL, 0);
-        mDockBatteryStatus = intent.getIntExtra(
-                                    BatteryManager.EXTRA_DOCK_STATUS,
-                                    BatteryManager.BATTERY_STATUS_UNKNOWN);
-        mBatteryPlugged = intent.getIntExtra(BatteryManager.EXTRA_DOCK_PLUGGED, 0) != 0;
-        mBatteryPresent = intent.getBooleanExtra(BatteryManager.EXTRA_DOCK_PRESENT, false);
-    }
-
-    @Override
     protected void drawCircle(Canvas canvas, int level, int animOffset, float textX, RectF drawRect) {
         super.drawCircle(canvas, level, animOffset, textX, drawRect);
         if (mDockIcon != null) {