From ae4b79ee6dd45c1f45d13da7c604ec8ecceb4306 Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Wed, 16 Aug 2017 14:34:56 -0700
Subject: [PATCH] Update strings when shortString is true

After b/64124535, battery strings in settings page use shortString
version. This cl updates the charging string in this situation to
match the mock.

Note that no matter whether we use shorString, the chargingLabel
should remain the same.

Bug: 64752046
Test: RunSettingsRoboTests
Change-Id: I4395d4660e212688cd560ca0b124acbd9c099cc9
---
 src/com/android/settings/fuelgauge/BatteryInfo.java          | 3 +--
 .../src/com/android/settings/fuelgauge/BatteryInfoTest.java  | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index bcc23463d0a..7a0cd276369 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -243,8 +243,7 @@ public class BatteryInfo {
                 info.remainingTimeUs = chargeTime;
                 CharSequence timeString = Utils.formatElapsedTime(context,
                         BatteryUtils.convertUsToMs(chargeTime), false /* withSeconds */);
-                int resId = shortString ? R.string.power_charging_duration_short
-                        : R.string.power_charging_duration;
+                int resId = R.string.power_charging_duration;
                 info.remainingLabel = TextUtils.expandTemplate(context.getText(
                         R.string.power_remaining_charging_duration_only), timeString);
                 info.chargeLabel = TextUtils.expandTemplate(context.getText(resId),
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index 7392eb6379a..d82a89b5f93 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -123,11 +123,14 @@ public class BatteryInfoTest {
     }
 
     @Test
-    public void testGetBatteryInfo_pluggedIn_dischargingFalse() {
+    public void testGetBatteryInfo_pluggedInUsingShortString_usesCorrectData() {
+        doReturn(TEST_CHARGE_TIME_REMAINING).when(mBatteryStats).computeChargeTimeRemaining(
+                anyLong());
         BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
                 mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */);
 
         assertThat(info.discharging).isEqualTo(false);
+        assertThat(info.chargeLabel.toString()).isEqualTo("50% - 1m until fully charged");
     }
 
     @Test