From 4dd92bf5a11324e3d67d1faa9e23006d4735db45 Mon Sep 17 00:00:00 2001 From: Wesley Wang Date: Tue, 9 Aug 2022 20:23:33 +0800 Subject: [PATCH] Update Settings charging string - Update charging protected string Bug: 236798712 Test: make and verify strings Change-Id: I86e063191b42e98d8836a6dbe3b32ff3ce3bb8d0 --- res/values/strings.xml | 4 ++-- .../src/com/android/settings/fuelgauge/BatteryInfoTest.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 406c4a27c0d..25d3b29cfab 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6278,9 +6278,9 @@ See apps with highest usage - Charging temporarily limited + Charging is paused - To preserve your battery. Learn more. + Protecting battery to extend battery lifespan\nTap to learn more %1$s diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java index 591c4e6b7f9..c5c47d27203 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java @@ -249,6 +249,8 @@ public class BatteryInfoTest { @Test public void testGetBatteryInfo_chargingWithOverheated_updateChargeLabel() { + final String expectedString = + mContext.getString(R.string.battery_tip_limited_temporarily_title); doReturn(TEST_CHARGE_TIME_REMAINING) .when(mBatteryUsageStats) .getChargeTimeRemainingMs(); @@ -260,7 +262,7 @@ public class BatteryInfoTest { false /* shortString */); assertThat(info.isOverheated).isTrue(); - assertThat(info.chargeLabel).isEqualTo("50% - Charging temporarily limited"); + assertThat(info.chargeLabel.toString()).contains(expectedString); } // Make our battery stats return a sequence of battery events.