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

Commit 43a325dd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update the battery string." into pi-dev

parents ab19293c a8d18b78

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -5053,7 +5053,7 @@ 
    <!-- Message for battery tip dialog to show the info to restrict the app [CHAR LIMIT=NONE] -->

    <string name="battery_tip_restrict_app_dialog_message">To save battery, stop <xliff:g id="app">%1$s</xliff:g> from using battery in the background. This app may not work properly and notifications may be delayed.</string>

    <!-- Message for battery tip dialog to show the info to restrict the app, below it app list will be shown as a view [CHAR LIMIT=NONE] -->

    <string name="battery_tip_restrict_apps_less_than_5_dialog_message">To save battery, stop these apps from using battery in the background. Restricted apps may not work properly and notifications may be delayed.\n\nApps:\n</string>

    <string name="battery_tip_restrict_apps_less_than_5_dialog_message">To save battery, stop these apps from using battery in the background. Restricted apps may not work properly and notifications may be delayed.\n\nApps:</string>

    <!-- Message for battery tip dialog to show the info to restrict the app, below it app list will be shown as raw string[CHAR LIMIT=NONE] -->

    <string name="battery_tip_restrict_apps_more_than_5_dialog_message">To save battery, stop these apps from using battery in the background. Restricted apps may not work properly and notifications may be delayed.\n\nApps:\n<xliff:g id="app_list">%1$s</xliff:g>.</string>

    <!-- OK button for battery tip dialog to show the restrict app list [CHAR LIMIT=NONE] -->

tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ public class BatteryTipDialogFragmentTest { 
                .isEqualTo(

                        "To save battery, stop these apps from using battery in the background. "

                                + "Restricted apps may not work properly and notifications may be"

                                + " delayed.\n\nApps:\n");

                                + " delayed.\n\nApps:");

        assertThat(shadowDialog.getView()).isNotNull();

    }