diff --git a/res/layout/storage_summary_donut.xml b/res/layout/storage_summary_donut.xml index 585fbf4ea96..eb260778951 100644 --- a/res/layout/storage_summary_donut.xml +++ b/res/layout/storage_summary_donut.xml @@ -17,7 +17,7 @@ diff --git a/res/values/colors.xml b/res/values/colors.xml index 4a095949905..ef8592588d1 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -104,9 +104,6 @@ #3c3c3c - - #ffd7d7d7 - #fff5f5f5 diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java index c450b900cb2..b9ed1e4a7b6 100644 --- a/src/com/android/settings/fuelgauge/BatteryMeterView.java +++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java @@ -49,7 +49,7 @@ public class BatteryMeterView extends ImageView { public BatteryMeterView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - final int frameColor = context.getColor(R.color.batterymeter_frame_color); + final int frameColor = context.getColor(R.color.meter_background_color); mAccentColorFilter = new PorterDuffColorFilter( Utils.getColorAttr(context, android.R.attr.colorAccent), PorterDuff.Mode.SRC_IN); mErrorColorFilter = new PorterDuffColorFilter( diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java index 0feaa07c3d7..7a13a0e80e6 100644 --- a/src/com/android/settings/widget/DonutView.java +++ b/src/com/android/settings/widget/DonutView.java @@ -17,12 +17,14 @@ package com.android.settings.widget; import android.content.Context; import android.graphics.Canvas; +import android.graphics.ColorFilter; import android.graphics.Paint; +import android.graphics.PorterDuff; +import android.graphics.PorterDuffColorFilter; import android.text.TextPaint; import android.util.AttributeSet; import android.view.View; -import com.android.internal.util.Preconditions; import com.android.settings.R; import com.android.settings.Utils; @@ -50,20 +52,26 @@ public class DonutView extends View { super(context, attrs); mDeviceDensity = getResources().getDisplayMetrics().density; mStrokeWidth = 6f * mDeviceDensity; + final ColorFilter mAccentColorFilter = + new PorterDuffColorFilter( + Utils.getColorAttr(context, android.R.attr.colorAccent), + PorterDuff.Mode.SRC_IN); mBackgroundCircle = new Paint(); mBackgroundCircle.setAntiAlias(true); mBackgroundCircle.setStrokeCap(Paint.Cap.BUTT); mBackgroundCircle.setStyle(Paint.Style.STROKE); mBackgroundCircle.setStrokeWidth(mStrokeWidth); - mBackgroundCircle.setColor(getResources().getColor(R.color.donut_background_grey)); + mBackgroundCircle.setColorFilter(mAccentColorFilter); + mBackgroundCircle.setColor(context.getColor(R.color.meter_background_color)); mFilledArc = new Paint(); mFilledArc.setAntiAlias(true); mFilledArc.setStrokeCap(Paint.Cap.BUTT); mFilledArc.setStyle(Paint.Style.STROKE); mFilledArc.setStrokeWidth(mStrokeWidth); - mFilledArc.setColor(Utils.getColorAccent(getContext())); + mFilledArc.setColor(Utils.getDefaultColor(mContext, R.color.meter_consumed_color)); + mFilledArc.setColorFilter(mAccentColorFilter); mTextPaint = new TextPaint(); mTextPaint.setColor(Utils.getColorAccent(getContext())); @@ -86,11 +94,25 @@ public class DonutView extends View { } private void drawDonut(Canvas canvas) { - canvas.drawArc(0 + mStrokeWidth, 0 + mStrokeWidth, getWidth() - mStrokeWidth, - getHeight() - mStrokeWidth, TOP, 360, false, mBackgroundCircle); + canvas.drawArc( + 0 + mStrokeWidth, + 0 + mStrokeWidth, + getWidth() - mStrokeWidth, + getHeight() - mStrokeWidth, + TOP, + 360, + false, + mBackgroundCircle); - canvas.drawArc(0 + mStrokeWidth, 0 + mStrokeWidth, getWidth() - mStrokeWidth, - getHeight() - mStrokeWidth, TOP, (360 * mPercent / 100), false, mFilledArc); + canvas.drawArc( + 0 + mStrokeWidth, + 0 + mStrokeWidth, + getWidth() - mStrokeWidth, + getHeight() - mStrokeWidth, + TOP, + (360 * mPercent / 100), + false, + mFilledArc); } private void drawInnerText(Canvas canvas) {