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

Merge "Fix the charging string while charging wirelessly" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-08-07 03:55:07 +00:00
committed by Android (Google) Code Review
parent e2f0a6b2d3 9e2bda0c87
commit 87778221d3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
View File

@@ -92,8 +92,7 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
&& mBatterySettingsFeatureProvider.isChargingOptimizationMode(mContext)) { && mBatterySettingsFeatureProvider.isChargingOptimizationMode(mContext)) {
return info.remainingLabel; return info.remainingLabel;
} }
if (info.remainingLabel == null if (info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
|| info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
return info.statusLabel; return info.statusLabel;
} }
if (info.pluggedStatus == BatteryManager.BATTERY_PLUGGED_WIRELESS) { if (info.pluggedStatus == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
@@ -106,6 +105,9 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
return wirelessChargingLabel; return wirelessChargingLabel;
} }
} }
if (info.remainingLabel == null) {
return info.statusLabel;
}
if (info.statusLabel != null && !info.discharging) { if (info.statusLabel != null && !info.discharging) {
// Charging state // Charging state
if (com.android.settingslib.fuelgauge.BatteryUtils.isChargingStringV2Enabled()) { if (com.android.settingslib.fuelgauge.BatteryUtils.isChargingStringV2Enabled()) {