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

Commit 08345933 authored by Wesley Wang's avatar Wesley Wang Committed by Automerger Merge Worker
Browse files

Merge "Update Settings charging string" into tm-qpr-dev am: 4909c792 am: 7ffe4ed6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19568529



Change-Id: Iaa3ff1fe5326ddce4752aa873424681ef34d284f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 80bf09e5 7ffe4ed6

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -6136,9 +6136,9 @@ 
    <!-- Summary for the battery high usage tip, which presents apps with highest usage [CHAR LIMIT=NONE] -->

    <string name="battery_tip_high_usage_summary">See apps with highest usage</string>

    <!-- Title for the battery limited temporarily tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_limited_temporarily_title">Charging temporarily limited</string>

    <string name="battery_tip_limited_temporarily_title">Charging is paused</string>

    <!-- Summary for the battery limited temporarily tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_limited_temporarily_summary">To preserve your battery. Learn more.</string>

    <string name="battery_tip_limited_temporarily_summary">Protecting battery to extend battery lifespan\nTap to learn more</string>

    <!-- Summary for the battery limited temporarily extra tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_limited_temporarily_extra_summary"><xliff:g id="percent" example="10%">%1$s</xliff:g></string>

    <!-- Text of battery limited temporarily tip resume charge button. [CHAR LIMIT=NONE] -->

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

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