| commit | 8c232535cf7bcd6f8ca7fe76abfd4613973c335f | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 30 06:38:20 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 30 06:38:20 2022 +0000 |
| tree | 5af0f7ab0afc1d64afb79fea53d66e3860f49197 | |
| parent | 6983f5867c5f552c2d5ebb857d22a1c5c319c33f [diff] | |
| parent | 226107f1d68845368704ae6424014ba3ddcee622 [diff] |
Merge "For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion." into tm-qpr-dev am: 226107f1d6 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>
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java index cfdd851..c1cffc8 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
@@ -515,7 +515,7 @@ 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(