From ef3b364728abe136b34d3e4ed5abeea699d90eef Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Thu, 14 Feb 2019 19:11:10 -0800 Subject: [PATCH] Update battery summary When it is charging, show "5% - charging"(not only "5%") Bug: 112013485 Test: RunSettingsRoboTests Change-Id: If2299cc4929d8fc40d63669b74590fafe39122dc --- .../fuelgauge/TopLevelBatteryPreferenceController.java | 4 +++- .../fuelgauge/TopLevelBatteryPreferenceControllerTest.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java index ce85be8daf6..c4da6701f0f 100644 --- 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, diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java index 7568987da3a..58ed6b46d73 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java @@ -61,5 +61,9 @@ public class TopLevelBatteryPreferenceControllerTest { info.remainingLabel = "Phone will shut down soon"; assertThat(getDashboardLabel(mContext, info)).isEqualTo("3% - Phone will shut down soon"); + + info.discharging = false; + info.chargeLabel = "5% - charging"; + assertThat(getDashboardLabel(mContext, info)).isEqualTo("5% - charging"); } }