From f45427bd5951a4fa60c0b409d28a8c01e3b034d0 Mon Sep 17 00:00:00 2001 From: pajacechen Date: Mon, 15 Jan 2024 17:34:46 +0800 Subject: [PATCH] [Reskin] Replace string for chargin on hold - replace the string for charging on hold in settings main page and battery status in battery settings page Bug: 315748218 Test: Manual Test Flag: NA Change-Id: I130d377912e150d593f6480e2bbdf43048b6916e --- .../fuelgauge/BatteryHeaderPreferenceController.java | 3 ++- .../fuelgauge/TopLevelBatteryPreferenceController.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java index d0b57fd347a..6a65dc07c88 100644 --- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java @@ -80,7 +80,8 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController return mContext.getString( com.android.settingslib.R.string.battery_info_status_not_charging); } 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 || info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) { // Present status only if no remaining time or status anomalous diff --git a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java index 0f54f3e7d03..365a2cacb89 100644 --- a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java @@ -153,6 +153,11 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle return mContext.getString( 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) { // Present status only if no remaining time or status anomalous return info.statusLabel;