commit 7035d9a9200c570544de5dbf030b5523dded5d30
author Android Build Merger (Role) <android-build-merger@google.com> Wed Mar 29 22:59:08 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 29 22:59:12 2017 +0000
tree bbf5534e04fe167604ffd5d1b5f1db9212e1815b
parent cedc7dfc2e59eec9946785bb127223d8f7275750
parent 37139298625d08ffb10cfd25be433503a7334540

Merge "Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: 3c7fce3579 am: 25105f6561 am: dfc1264eff" into oc-dev-plus-aosp

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);
             }