Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d0121e0 authored by YK Hung's avatar YK Hung Committed by Android (Google) Code Review
Browse files

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

parents 5d0bd755 f45427bd

src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java

+5 −0
Original line number Diff line number Diff line
@@ -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;