BatteryMeterDrawableBase: Set proper stroke when power saver is enabled (bf65d610) · Commits · e / os / android_frameworks_base

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -169,8 +169,6 @@ public class BatteryMeterDrawableBase extends Drawable {
		mPowersavePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
		mPowersavePaint.setColor(mPlusPaint.getColor());
		mPowersavePaint.setStyle(Style.STROKE);
		mPowersavePaint.setStrokeWidth(context.getResources()
		.getDimensionPixelSize(R.dimen.battery_powersave_outline_thickness));

		mIntrinsicWidth = context.getResources().getDimensionPixelSize(R.dimen.battery_width);
		mIntrinsicHeight = context.getResources().getDimensionPixelSize(R.dimen.battery_height);
		@@ -342,6 +340,8 @@ public class BatteryMeterDrawableBase extends Drawable {
		mBatteryPaint.setStrokeWidth(strokeWidth);
		mBatteryPaint.setStyle(Paint.Style.STROKE);

		mPowersavePaint.setStrokeWidth(strokeWidth);

		mFrame.set(
		strokeWidth / 2.0f + mPadding.left,
		strokeWidth / 2.0f,
		@@ -381,8 +381,12 @@ public class BatteryMeterDrawableBase extends Drawable {

		// draw colored arc representing charge level
		if (level > 0) {
		if (!mCharging && mPowerSaveEnabled && mPowerSaveAsColorError) {
		c.drawArc(mFrame, 270, 3.6f * level, false, mPowersavePaint);
		} else {
		c.drawArc(mFrame, 270, 3.6f * level, false, mBatteryPaint);
		}
		}

		// compute percentage text
		float pctX = 0, pctY = 0;
		@@ -398,13 +402,6 @@ public class BatteryMeterDrawableBase extends Drawable {

		c.drawText(pctText, pctX, pctY, mTextPaint);
		}

		// Draw the powersave outline last
		if (!mCharging && mPowerSaveEnabled && mPowerSaveAsColorError) {
		if (level > 0) {
		c.drawArc(mFrame, 270, 3.6f * level, false, mPowersavePaint);
		}
		}
		}

		private void drawRectangle(Canvas c) {
		@@ -427,6 +424,9 @@ public class BatteryMeterDrawableBase extends Drawable {
		mBatteryPaint.setStrokeWidth(0);
		mBatteryPaint.setStyle(Paint.Style.FILL_AND_STROKE);

		mPowersavePaint.setStrokeWidth(mContext.getResources()
		.getDimensionPixelSize(R.dimen.battery_powersave_outline_thickness));

		mFrame.set(left, top, width + left, height + top);
		mFrame.offset(px, 0);