Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 292b083b authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

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

am: f20ce471

* commit 'f20ce471':
  Fix overlapping things in battery indicator

Change-Id: Ia0538ded477db637d7642e5f5206f8418c5a7f0f
parents 3f701f8c f20ce471

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

+2 −2
Original line number Diff line number Diff line
@@ -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;