Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae4b79ee authored by jackqdyulei's avatar jackqdyulei
Browse files

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
parent d0275e53

src/com/android/settings/fuelgauge/BatteryInfo.java

+1 −2
Original line number Diff line number Diff line
@@ -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),

tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java

+4 −1
Original line number Diff line number Diff line
@@ -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