Merge "Fix some battery icon issues"

packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java

@@ -182,6 +182,7 @@ public class BatteryMeterDrawable extends Drawable implements DemoMode,
         mListening = true;
         mContext.getContentResolver().registerContentObserver(
                 Settings.System.getUriFor(SHOW_PERCENT_SETTING), false, mSettingObserver);
+        updateShowPercent();
         if (mDemoMode) return;
         mBatteryController.addStateChangedCallback(this);
     }
@@ -193,6 +194,11 @@ public class BatteryMeterDrawable extends Drawable implements DemoMode,
         mBatteryController.removeStateChangedCallback(this);
     }
 
+    public void disableShowPercent() {
+        mShowPercent = false;
+        postInvalidate();
+    }
+
     private void postInvalidate() {
         mHandler.post(new Runnable() {
             @Override

packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java

@@ -153,6 +153,7 @@ public class BatteryTile extends QSTile<QSTile.State> implements BatteryControll
         private void bindView() {
             mDrawable.onBatteryLevelChanged(100, false, false);
             mDrawable.onPowerSaveChanged(true);
+            mDrawable.disableShowPercent();
             ((ImageView) mCurrentView.findViewById(android.R.id.icon)).setImageDrawable(mDrawable);
             Checkable checkbox = (Checkable) mCurrentView.findViewById(android.R.id.toggle);
             checkbox.setChecked(mPowerSave);