PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix storage summary background colors.

Browse Source 
This changes the donut background color to a lighter blue and changes
the overall background to be a grey. Both of these colors match the
Battery implementation.

Bug: 35245772
Test: Manual
Change-Id: I8e12afe4434a0e2428384fc496cab5c05dc998ee
This commit is contained in:
Daniel Nishi
2017-05-09 10:56:58 -07:00
parent fc4db3bd80
commit 12dbce00c1
4 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/widget/DonutView.java
View File

@@ -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) {