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

Commit e5c7317f authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Update string in battery app info page" into pi-dev

parents ab988900 8d1e9fe6
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -4728,7 +4728,7 @@
    <string name="power_charge_remaining"><xliff:g id="until_charged">%1$s</xliff:g> to charge</string>
    <!-- Title for the background activity setting, which allows a user to control whether an app can run in the background [CHAR_LIMIT=40] -->
    <string name="background_activity_title">Restricted</string>
    <string name="background_activity_title">Battery restrictions</string>
    <!-- Summary for the background activity [CHAR_LIMIT=120] -->
    <string name="background_activity_summary">Allow the app to run in the background</string>
    <!-- Summary for the background activity when it is on [CHAR_LIMIT=120] -->
@@ -7755,9 +7755,9 @@
    <string name="encryption_interstitial_no">No</string>
    <!-- Label to say yes to the question of whether app is restricted. [CHAR LIMIT=20] -->
    <string name="restricted_true_label">Yes</string>
    <string name="restricted_true_label">On / Background usage restricted</string>
    <!-- Label to say no to the question of whether app is restricted. [CHAR LIMIT=20] -->
    <string name="restricted_false_label">No</string>
    <string name="restricted_false_label">Off / Uses battery in background</string>
    <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
    <string name="encrypt_talkback_dialog_require_pin">Require PIN?</string>
+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ public class BackgroundActivityPreferenceControllerTest {

        mController.updateSummary(mPreference);

        assertThat(mPreference.getSummary()).isEqualTo("No");
        assertThat(mPreference.getSummary()).isEqualTo("Off / Uses battery in background");
    }

    @Test
@@ -184,7 +184,7 @@ public class BackgroundActivityPreferenceControllerTest {

        mController.updateSummary(mPreference);

        assertThat(mPreference.getSummary()).isEqualTo("Yes");
        assertThat(mPreference.getSummary()).isEqualTo("On / Background usage restricted");
    }

    @Test