PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the master code the same as tm-qpr-dev to avoid future merge conflicts.

Browse Source 
Bug: 243746796
Test: manual
Change-Id: I9c693a65ebbbe33c9d132131f832c26505a23a4e
This commit is contained in:
Zaiyue Xue
2022-08-26 13:36:36 +08:00
parent 855dc04b31
commit 4bb92296b5
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
View File

@@ -595,13 +595,14 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
// Searches the corresponding trapezoid index from x location. // Searches the corresponding trapezoid index from x location.
private int getTrapezoidIndex(float x) { private int getTrapezoidIndex(float x) {
if (mTrapezoidSlots != null) { if (mTrapezoidSlots == null) {
for (int index = 0; index < mTrapezoidSlots.length; index++) { return BatteryChartViewModel.SELECTED_INDEX_INVALID;
final TrapezoidSlot slot = mTrapezoidSlots[index]; }
if (x >= slot.mLeft - mTrapezoidHOffset for (int index = 0; index < mTrapezoidSlots.length; index++) {
&& x <= slot.mRight + mTrapezoidHOffset) { final TrapezoidSlot slot = mTrapezoidSlots[index];
return index; if (x >= slot.mLeft - mTrapezoidHOffset
} && x <= slot.mRight + mTrapezoidHOffset) {
return index;
} }
} }
return BatteryChartViewModel.SELECTED_INDEX_INVALID; return BatteryChartViewModel.SELECTED_INDEX_INVALID;