Merge "Update battery summary"

2019-02-15 18:26:56 +00:00
parent 9232a4a147 ef3b364728
commit 755a7d5b65
2 changed files with 7 additions and 1 deletions
--- a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
@@ -80,7 +80,9 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
        }
        CharSequence label;
        final BidiFormatter formatter = BidiFormatter.getInstance();
-        if (info.remainingLabel == null) {
+        if (!info.discharging && info.chargeLabel != null) {
+            label = info.chargeLabel;
+        } else if (info.remainingLabel == null) {
            label = info.batteryPercentString;
        } else {
            label = context.getString(R.string.power_remaining_settings_home_page,