Merge "[Reskin] Update string of incompatible charging on settings" into main

2024-01-16 16:29:10 +00:00
parent 3c71a5ff22 fe96aee940
commit a8fa24ccd5
2 changed files with 6 additions and 2 deletions
--- a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
@@ -151,7 +151,8 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
    private CharSequence generateLabel(BatteryInfo info) {
        if (Utils.containsIncompatibleChargers(mContext, TAG)) {
            return mContext.getString(
-                    com.android.settingslib.R.string.battery_info_status_not_charging);
+                    com.android.settingslib.R.string.power_incompatible_charging_settings_home_page,
+                    info.batteryPercentString);
        }
        if (BatteryUtils.isBatteryDefenderOn(info)) {
            return mContext.getString(