From 8af93cb2403372eaee0e705aec409d09227cb5ed Mon Sep 17 00:00:00 2001 From: Daniel Nishi Date: Mon, 15 May 2017 14:37:20 -0700 Subject: [PATCH] batterymeter -> just meter. This updates some of the names of the colors to make them more general for non-battery usage. Bug: 35245772 Test: Manual Change-Id: I048f673037c4bd7279fd7c55f2d55be6b3618b41 --- ...{batterymeter_frame_color.xml => meter_background_color.xml} | 0 .../{batterymeter_charge_color.xml => meter_consumed_color.xml} | 0 .../com/android/settingslib/graph/BatteryMeterDrawableBase.java | 2 +- .../SystemUI/src/com/android/systemui/BatteryMeterView.java | 2 +- .../src/com/android/systemui/qs/tiles/BatterySaverTile.java | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename packages/SettingsLib/res/color/{batterymeter_frame_color.xml => meter_background_color.xml} (100%) rename packages/SettingsLib/res/color/{batterymeter_charge_color.xml => meter_consumed_color.xml} (100%) diff --git a/packages/SettingsLib/res/color/batterymeter_frame_color.xml b/packages/SettingsLib/res/color/meter_background_color.xml similarity index 100% rename from packages/SettingsLib/res/color/batterymeter_frame_color.xml rename to 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 similarity index 100% rename from packages/SettingsLib/res/color/batterymeter_charge_color.xml rename to 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 3a2397f671e00..3d50f2362cf27 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 9dd39d432527d..cf8747e19e85d 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 ecc275db46b6c..74cc0ecca2bc9 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 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