Merge "batterymeter -> just meter." into oc-dev am: da4c81d942

am: 5c05a04448

Change-Id: I12afdef1cda46b685274ce0c359ffec9650f25bd

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

@@ -144,7 +144,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));

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

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