commit 834c260e98d8858dca73b38658229f6d5bc8f2bf
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 29 22:50:28 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 29 22:50:31 2017 +0000
tree 6724fca845cff69b3d017edefc8ae18c0d5777e1
parent f1cc8b82b308016e1b47f9c85d860cff6bb76bbb
parent 7c8564e6adb259ddf8c5626c8f59079e2e32cb79

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

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

diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java b/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java
index 6764a6b..0f443d6 100755
--- a/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java
+++ b/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java
@@ -101,7 +101,7 @@
         for (int i=0; i < N; i++) {
             mColors[2 * i] = levels.getInt(i, 0);
             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 {
                 mColors[2 * i + 1] = colors.getColor(i, 0);
             }