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

Commit 763bead1 authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

Merge "Bold the battery saver '+' icon" into pi-dev 

am: 9f875323

Change-Id: I1d85d92a0e7b6791af0f4297f0490158c9e1fbfc
parents 9df4f08a 9f875323

packages/SettingsLib/res/values/arrays.xml

+10 −10
Original line number Diff line number Diff line
@@ -576,18 +576,18 @@ 
        <item>0</item>  <item>334</item>

    </array>

    <array name="batterymeter_plus_points">

        <item>3</item><item>0</item>

        <item>5</item><item>0</item>

        <item>5</item><item>3</item>

        <item>8</item><item>3</item>

        <item>8</item><item>5</item>

        <item>5</item><item>5</item>

        <item>5</item><item>8</item>

        <item>3</item><item>8</item>

        <item>3</item><item>5</item>

        <item>11</item><item>0</item>

        <item>11</item><item>5</item>

        <item>16</item><item>5</item>

        <item>16</item><item>11</item>

        <item>11</item><item>11</item>

        <item>11</item><item>16</item>

        <item>5</item><item>16</item>

        <item>5</item><item>11</item>

        <item>0</item><item>11</item>

        <item>0</item><item>5</item>

        <item>0</item><item>3</item>

        <item>3</item><item>3</item>

        <item>5</item><item>5</item>

    </array>



</resources>

packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java

+3 −9
Original line number Diff line number Diff line
@@ -393,18 +393,12 @@ public class BatteryMeterDrawableBase extends Drawable { 
                        mPlusFrame.top + mPlusPoints[1] * mPlusFrame.height());

            }



            float fillPct = (mPlusFrame.bottom - levelTop) / (mPlusFrame.bottom - mPlusFrame.top);

            fillPct = Math.min(Math.max(fillPct, 0), 1);

            if (fillPct <= BOLT_LEVEL_THRESHOLD) {

                // draw the plus if opaque

                c.drawPath(mPlusPath, mPlusPaint);

            } else {

            // Always cut out of the whole shape, and sometimes filled colorError

            mShapePath.op(mPlusPath, Path.Op.DIFFERENCE);

            if (mPowerSaveAsColorError) {

                c.drawPath(mPlusPath, mPlusPaint);

            }

        }

        }



        // compute percentage text

        boolean pctOpaque = false;