Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie (190e4b24) · 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);

packages/SystemUI/res/layout/battery_percentage_view.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,5 @@
		android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"
		android:textColor="?android:attr/textColorPrimary"
		android:gravity="center_vertical\|start"
		android:paddingStart="@dimen/battery_level_padding_start"
		android:importantForAccessibility="no"
		/>

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ public class BatteryMeterView extends LinearLayout implements
		private TextView mBatteryPercentView;

		private boolean mCharging;
		private boolean mBatteryHidden;
		private int mBatteryStyle = BATTERY_STYLE_PORTRAIT;

		private BatteryController mBatteryController;
		@@ -211,9 +212,9 @@ public class BatteryMeterView extends LinearLayout implements
		public void onTuningChanged(String key, String newValue) {
		if (StatusBarIconController.ICON_BLACKLIST.equals(key)) {
		ArraySet<String> icons = StatusBarIconController.getIconBlacklist(newValue);
		boolean hidden = icons.contains(mSlotBattery);
		Dependency.get(IconLogger.class).onIconVisibility(mSlotBattery, !hidden);
		setVisibility(hidden ? View.GONE : View.VISIBLE);
		mBatteryHidden = icons.contains(mSlotBattery);
		Dependency.get(IconLogger.class).onIconVisibility(mSlotBattery, !mBatteryHidden);
		setVisibility(mBatteryHidden ? View.GONE : View.VISIBLE);
		} else if (STATUS_BAR_BATTERY_STYLE.equals(key) && newValue != null) {
		mBatteryStyle = Integer.parseInt(newValue);
		updateBatteryStyle();
		@@ -299,6 +300,13 @@ public class BatteryMeterView extends LinearLayout implements
		LayoutParams.WRAP_CONTENT,
		LayoutParams.MATCH_PARENT));
		}
		if (mBatteryStyle == BATTERY_STYLE_TEXT) {
		mBatteryPercentView.setPaddingRelative(0, 0, 0, 0);
		} else {
		Resources res = getContext().getResources();
		mBatteryPercentView.setPaddingRelative(
		res.getDimensionPixelSize(R.dimen.battery_level_padding_start), 0, 0, 0);
		}
		} else {
		mDrawable.setShowPercent(drawPercentInside);
		if (showing) {
		@@ -347,7 +355,7 @@ public class BatteryMeterView extends LinearLayout implements
		mBatteryIconView.setImageDrawable(mDrawable);
		scaleBatteryMeterViews();
		}
		setVisibility(View.VISIBLE);
		setVisibility(mBatteryHidden ? View.GONE : View.VISIBLE);
		}

		@Override