From 49573e9c89a279397288d5139deadb5ec27c9821 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Tue, 29 Mar 2016 10:48:33 -0400 Subject: Fix overlapping things in battery indicator Bug: 27335792 Change-Id: I5b39fdad6ba21cbc75b1a0da9f66ae748b8a7f1e --- packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java index 4845425c233e..087f61eda211 100755 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java @@ -452,7 +452,7 @@ public class BatteryMeterDrawable extends Drawable implements DemoMode, 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 @@ public class BatteryMeterDrawable extends Drawable implements DemoMode, 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; -- cgit v1.2.3-59-g8ed1b