Commit 8c232535 authored Aug 30, 2022 by TreeHugger Robot Committed by Automerger Merge Worker Aug 30, 2022

Merge "For battery chart 7-bar case, remove the center two labels according to...

Merge "For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion." into tm-qpr-dev am: 226107f1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19755527

Change-Id: Ic0537775efd1294e9896adf5de3e61b84900fa09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -515,7 +515,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick

		private boolean hasOverlap(
		final Rect[] displayAreas, final int leftIndex, final int rightIndex) {
		return displayAreas[leftIndex].right + mTextPadding * 2f > displayAreas[rightIndex].left;
		return displayAreas[leftIndex].right + mTextPadding * 2.3f > displayAreas[rightIndex].left;
		}

		private void drawAxisLabelText(