Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev am: 1eb2f15339

am: e9d1f6f1ae Change-Id: I1b6ae16aa8899561e240c09eaaa2c89083a70b4a
2017-06-27 18:46:14 +00:00
parent 2f09c9e4c8 e9d1f6f1ae
commit 6b7ff12008
2 changed files with 14 additions and 2 deletions
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -227,8 +227,9 @@ public class BatteryInfo {
                final String chargeStatusLabel = resources.getString(
                        R.string.battery_info_status_charging_lower);
                info.remainingLabel = null;
-                info.chargeLabel = resources.getString(
-                        R.string.power_charging, info.batteryPercentString, chargeStatusLabel);
+                info.chargeLabel = info.batteryLevel == 100 ? info.batteryPercentString :
+                        resources.getString(R.string.power_charging, info.batteryPercentString,
+                                chargeStatusLabel);
            }
        }
        return info;