From a8d18b78197bc4f04153e4537e4d08f1789811c7 Mon Sep 17 00:00:00 2001
From: Lei Yu <jackqdyulei@google.com>
Date: Fri, 30 Mar 2018 12:19:31 -0700
Subject: [PATCH] Update the battery string.

Remove the extra new line.

Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: I48555c51ef49aabf1bfd98baa4682a21936bd48e
---
 res/values/strings.xml                                          | 2 +-
 .../fuelgauge/batterytip/BatteryTipDialogFragmentTest.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 696e9bb3f35..76e9003ac92 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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] -->
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
index 6fc7f2a502c..5affa8d98c4 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
@@ -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();
     }