Merge "Fix battery warning color lookup" into oc-dev (834c260e) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}