Merge "Update material_deep_teal_500 to #008577." into pi-dev am: 3749a8d871

am: 4b6cdc6b04

Change-Id: Ie8d15a1efdd54a2b35c38391ee1860a832cd7cbb
This commit is contained in:
Andrew Sapperstein
2018-03-21 19:21:12 +00:00
committed by android-build-merger
4 changed files with 10 additions and 31 deletions

View File

@@ -363,7 +363,8 @@ public class BatteryHistoryChart extends View {
mThinLineWidth = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
2, getResources().getDisplayMetrics());
mBatteryBackgroundPaint.setColor(0xFF009688);
int accentColor = Utils.getColorAccent(mContext);
mBatteryBackgroundPaint.setColor(accentColor);
mBatteryBackgroundPaint.setStyle(Paint.Style.FILL);
mBatteryGoodPaint.setARGB(128, 0, 128, 0);
mBatteryGoodPaint.setStyle(Paint.Style.STROKE);
@@ -383,13 +384,13 @@ public class BatteryHistoryChart extends View {
mPhoneSignalChart.setColors(com.android.settings.Utils.BADNESS_COLORS);
mDebugRectPaint.setARGB(255, 255, 0, 0);
mDebugRectPaint.setStyle(Paint.Style.STROKE);
mScreenOnPaint.setColor(0xFF009688);
mGpsOnPaint.setColor(0xFF009688);
mCameraOnPaint.setColor(0xFF009688);
mFlashlightOnPaint.setColor(0xFF009688);
mWifiRunningPaint.setColor(0xFF009688);
mCpuRunningPaint.setColor(0xFF009688);
mChargingPaint.setColor(0xFF009688);
mScreenOnPaint.setColor(accentColor);
mGpsOnPaint.setColor(accentColor);
mCameraOnPaint.setColor(accentColor);
mFlashlightOnPaint.setColor(accentColor);
mWifiRunningPaint.setColor(accentColor);
mCpuRunningPaint.setColor(accentColor);
mChargingPaint.setColor(accentColor);
TypedArray a =
context.obtainStyledAttributes(