diff options
| -rw-r--r-- | packages/SettingsLib/res/color/meter_background_color.xml (renamed from packages/SettingsLib/res/color/batterymeter_frame_color.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/res/color/meter_consumed_color.xml (renamed from packages/SettingsLib/res/color/batterymeter_charge_color.xml) | 0 | ||||
| -rwxr-xr-x | packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/BatteryMeterView.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/packages/SettingsLib/res/color/batterymeter_frame_color.xml b/packages/SettingsLib/res/color/meter_background_color.xml index 34de5489a28b..34de5489a28b 100644 --- a/packages/SettingsLib/res/color/batterymeter_frame_color.xml +++ b/packages/SettingsLib/res/color/meter_background_color.xml diff --git a/packages/SettingsLib/res/color/batterymeter_charge_color.xml b/packages/SettingsLib/res/color/meter_consumed_color.xml index 15944c3a2a07..15944c3a2a07 100644 --- a/packages/SettingsLib/res/color/batterymeter_charge_color.xml +++ b/packages/SettingsLib/res/color/meter_consumed_color.xml diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java b/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java index 3a2397f671e0..3d50f2362cf2 100755 --- a/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java +++ b/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java @@ -141,7 +141,7 @@ public class BatteryMeterDrawableBase extends Drawable { mWarningTextPaint.setColor(mColors[1]); } - mChargeColor = Utils.getDefaultColor(mContext, R.color.batterymeter_charge_color); + mChargeColor = Utils.getDefaultColor(mContext, R.color.meter_consumed_color); mBoltPaint = new Paint(Paint.ANTI_ALIAS_FLAG); mBoltPaint.setColor(Utils.getDefaultColor(mContext, R.color.batterymeter_bolt_color)); diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java index 9dd39d432527..cf8747e19e85 100644 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java @@ -89,7 +89,7 @@ public class BatteryMeterView extends LinearLayout implements TypedArray atts = context.obtainStyledAttributes(attrs, R.styleable.BatteryMeterView, defStyle, 0); final int frameColor = atts.getColor(R.styleable.BatteryMeterView_frameColor, - context.getColor(R.color.batterymeter_frame_color)); + context.getColor(R.color.meter_background_color)); mDrawable = new BatteryMeterDrawableBase(context, frameColor); atts.recycle(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java index ecc275db46b6..74cc0ecca2bc 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java @@ -141,7 +141,7 @@ public class BatterySaverTile extends QSTileImpl<BooleanState> implements private final BatteryMeterDrawableBase mDrawable = new BatteryMeterDrawableBase( mHost.getContext(), - mHost.getContext().getColor(R.color.batterymeter_frame_color)); + mHost.getContext().getColor(R.color.meter_background_color)); private View mCurrentView; @Override |