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

Merge "[Reskin] Replace string for chargin on hold" into main

Browse Source
This commit is contained in:
YK Hung
2024-01-15 15:09:59 +00:00
committed by Android (Google) Code Review
parent 5d0bd7555d f45427bd59
commit 5d0121e044
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,8 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
return mContext.getString( return mContext.getString(
com.android.settingslib.R.string.battery_info_status_not_charging); com.android.settingslib.R.string.battery_info_status_not_charging);
} else if (BatteryUtils.isBatteryDefenderOn(info)) { } else if (BatteryUtils.isBatteryDefenderOn(info)) {
return null; return mContext.getString(
com.android.settingslib.R.string.battery_info_status_charging_on_hold);
} else if (info.remainingLabel == null } else if (info.remainingLabel == null
|| info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) { || info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
// Present status only if no remaining time or status anomalous // Present status only if no remaining time or status anomalous

5
src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
View File

@@ -153,6 +153,11 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
return mContext.getString( return mContext.getString(
com.android.settingslib.R.string.battery_info_status_not_charging); com.android.settingslib.R.string.battery_info_status_not_charging);
} }
if (BatteryUtils.isBatteryDefenderOn(info)) {
return mContext.getString(
com.android.settingslib.R.string.power_charging_on_hold_settings_home_page,
info.batteryPercentString);
}
if (info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) { if (info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
// Present status only if no remaining time or status anomalous // Present status only if no remaining time or status anomalous
return info.statusLabel; return info.statusLabel;