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

Merge "Fix battery warning color lookup" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-29 22:50:28 +00:00
committed by Android (Google) Code Review
parent f1cc8b82b3 7c8564e6ad
commit 834c260e98
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,7 +101,7 @@ public class BatteryMeterDrawableBase extends Drawable {
for (int i=0; i < N; i++) { for (int i=0; i < N; i++) {
mColors[2 * i] = levels.getInt(i, 0); mColors[2 * i] = levels.getInt(i, 0);
if (colors.getType(i) == TypedValue.TYPE_ATTRIBUTE) { if (colors.getType(i) == TypedValue.TYPE_ATTRIBUTE) {
mColors[2 * i + 1] = Utils.getColorAttr(context, colors.getResourceId(i, 0)); mColors[2 * i + 1] = Utils.getColorAttr(context, colors.getThemeAttributeId(i, 0));
} else { } else {
mColors[2 * i + 1] = colors.getColor(i, 0); mColors[2 * i + 1] = colors.getColor(i, 0);
} }