Merge "Update battery strings" into pi-dev am: 7bbc11e87d

am: ab4ebab76c

Change-Id: Ic7bd7ff889bf921cdf3123d5df7a73795f3b734a

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

@@ -174,7 +174,7 @@ public class BackgroundActivityPreferenceControllerTest {
 
         mController.updateSummary(mPreference);
 
-        assertThat(mPreference.getSummary()).isEqualTo("Off / Uses battery in background");
+        assertThat(mPreference.getSummary()).isEqualTo("App can use battery in background");
     }
 
     @Test
@@ -184,7 +184,7 @@ public class BackgroundActivityPreferenceControllerTest {
 
         mController.updateSummary(mPreference);
 
-        assertThat(mPreference.getSummary()).isEqualTo("On / Background usage restricted");
+        assertThat(mPreference.getSummary()).isEqualTo("App can\u2019t use battery in background");
     }
 
     @Test

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

@@ -121,7 +121,7 @@ public class RestrictAppPreferenceControllerTest {
 
         mRestrictAppPreferenceController.updateState(mPreference);
 
-        assertThat(mPreference.getSummary()).isEqualTo("1 app");
+        assertThat(mPreference.getSummary()).isEqualTo("Limiting battery usage for 1 app");
     }
 
     @Test
@@ -134,7 +134,7 @@ public class RestrictAppPreferenceControllerTest {
 
         mRestrictAppPreferenceController.updateState(mPreference);
 
-        assertThat(mPreference.getSummary()).isEqualTo("2 apps");
+        assertThat(mPreference.getSummary()).isEqualTo("Limiting battery usage for 2 apps");
     }
 
     @Test
@@ -146,7 +146,7 @@ public class RestrictAppPreferenceControllerTest {
 
         mRestrictAppPreferenceController.updateState(mPreference);
 
-        assertThat(mPreference.getSummary()).isEqualTo("1 app");
+        assertThat(mPreference.getSummary()).isEqualTo("Limiting battery usage for 1 app");
         assertThat(mRestrictAppPreferenceController.mAppInfos).containsExactly(
                 new AppInfo.Builder()
                         .setUid(RESTRICTED_UID)

tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java

@@ -84,7 +84,7 @@ public class AutoBatterySeekBarPreferenceControllerTest {
         mController.updateState(mPreference);
 
         assertThat(mPreference.isVisible()).isTrue();
-        assertThat(mPreference.getTitle()).isEqualTo("Turn on at 20%");
+        assertThat(mPreference.getTitle()).isEqualTo("At 20%");
         assertThat(mPreference.getProgress()).isEqualTo(TRIGGER_LEVEL);
     }
 

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

@@ -76,7 +76,7 @@ public class BatteryManagerPreferenceControllerTest {
 
         mController.updateState(mPreference);
 
-        assertThat(mPreference.getSummary()).isEqualTo("On / Restricting apps automatically");
+        assertThat(mPreference.getSummary()).isEqualTo("On / Detecting when apps drain battery");
     }
 
     @Test

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

@@ -127,8 +127,9 @@ public class BatteryTipDialogFragmentTest {
 
         assertThat(shadowDialog.getTitle()).isEqualTo("Restrict app?");
         assertThat(shadowDialog.getMessage())
-                .isEqualTo("To save battery, stop app from using "
-                        + "battery in the background.");
+                .isEqualTo(
+                        "To save battery, stop app from using battery in the background. This app"
+                                + " may not work properly and notifications may be delayed.");
     }
 
     @Test
@@ -147,8 +148,10 @@ public class BatteryTipDialogFragmentTest {
 
         assertThat(shadowDialog.getTitle()).isEqualTo("Restrict 2 apps?");
         assertThat(shadowDialog.getMessage())
-                .isEqualTo("To save battery, stop these apps from using battery in the background"
-                        + ".\n\nApps:\n");
+                .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");
         assertThat(shadowDialog.getView()).isNotNull();
     }
 
@@ -174,8 +177,10 @@ public class BatteryTipDialogFragmentTest {
 
         assertThat(shadowDialog.getTitle()).isEqualTo("Restrict 6 apps?");
         assertThat(shadowDialog.getMessage())
-                .isEqualTo("To save battery, stop these apps from using battery in the background"
-                        + ".\n\nApps:\napp, app, app, app, app, and app.");
+                .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:\napp, app, app, app, app, and app.");
     }
 
     @Test