commit f20ce4712edf7913aaabe9b722fdc429b8e853a6
author Jason Monk <jmonk@google.com> Tue Mar 29 14:53:12 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 29 14:53:14 2016 +0000
tree f7941d73212ed80023a05d9cac59b9b77218d4cd
parent bf0982d01135d544e9057efbab66b95592823c3f
parent 49573e9c89a279397288d5139deadb5ec27c9821

Merge "Fix overlapping things in battery indicator" into nyc-dev

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

diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java
index 4845425..087f61e 100755
--- a/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java
@@ -452,7 +452,7 @@
         boolean pctOpaque = false;
         float pctX = 0, pctY = 0;
         String pctText = null;
-        if (!mPluggedIn && level > mCriticalLevel && mShowPercent) {
+        if (!mPluggedIn && !mPowerSaveEnabled && level > mCriticalLevel && mShowPercent) {
             mTextPaint.setColor(getColorForLevel(level));
             mTextPaint.setTextSize(height *
                     (SINGLE_DIGIT_PERCENT ? 0.75f
@@ -480,7 +480,7 @@
         mShapePath.op(mClipPath, Path.Op.INTERSECT);
         c.drawPath(mShapePath, mBatteryPaint);
 
-        if (!mPluggedIn) {
+        if (!mPluggedIn && !mPowerSaveEnabled) {
             if (level <= mCriticalLevel) {
                 // draw the warning text
                 final float x = mWidth * 0.5f;