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

Commit f20ce471 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

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

parents bf0982d0 49573e9c

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -452,7 +452,7 @@ public class BatteryMeterDrawable extends Drawable implements DemoMode, 
        boolean pctOpaque = false;

        boolean pctOpaque = false;

        float pctX = 0, pctY = 0;

        float pctX = 0, pctY = 0;

        String pctText = null;

        String pctText = null;

        if (!mPluggedIn && level > mCriticalLevel && mShowPercent) {

        if (!mPluggedIn && !mPowerSaveEnabled && level > mCriticalLevel && mShowPercent) {

            mTextPaint.setColor(getColorForLevel(level));

            mTextPaint.setColor(getColorForLevel(level));

            mTextPaint.setTextSize(height *

            mTextPaint.setTextSize(height *

                    (SINGLE_DIGIT_PERCENT ? 0.75f

                    (SINGLE_DIGIT_PERCENT ? 0.75f
@@ -480,7 +480,7 @@ public class BatteryMeterDrawable extends Drawable implements DemoMode, 
        mShapePath.op(mClipPath, Path.Op.INTERSECT);

        mShapePath.op(mClipPath, Path.Op.INTERSECT);

        c.drawPath(mShapePath, mBatteryPaint);

        c.drawPath(mShapePath, mBatteryPaint);





        if (!mPluggedIn) {

        if (!mPluggedIn && !mPowerSaveEnabled) {

            if (level <= mCriticalLevel) {

            if (level <= mCriticalLevel) {

                // draw the warning text

                // draw the warning text

                final float x = mWidth * 0.5f;

                final float x = mWidth * 0.5f;