Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 9f8753230f

Change-Id: I1d85d92a0e7b6791af0f4297f0490158c9e1fbfc
This commit is contained in:
Evan Laird
2018-04-17 06:38:57 -07:00
committed by android-build-merger
parent 9df4f08a33 9f8753230f
commit 763bead125
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SettingsLib/res/values/arrays.xml
View File

@@ -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>

12
packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java
View File

@@ -393,16 +393,10 @@ 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
// Always cut out of the whole shape, and sometimes filled colorError
mShapePath.op(mPlusPath, Path.Op.DIFFERENCE);
if (mPowerSaveAsColorError) {
c.drawPath(mPlusPath, mPlusPaint);
} else {
mShapePath.op(mPlusPath, Path.Op.DIFFERENCE);
if (mPowerSaveAsColorError) {
c.drawPath(mPlusPath, mPlusPaint);
}
}
}