commit 39d97b1387a4083bbe0f436fa5178611211819ad
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 26 23:03:12 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 26 23:03:12 2018 +0000
tree 5cf0f1ecfd96c8e0bf7f2a728aa0b84b6b36e684
parent 976ca1c4c7546f24cffca3fbc18c9f5956d32245
parent 7b38d57080f4d6868a7ec19e91b057eba9afd2d8

Merge "Update battery percentage preference strings"

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index cac168f..d8d084d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5424,9 +5424,9 @@
     <string name="battery_saver_turn_on_automatically_pct">at <xliff:g id="percent">%1$s</xliff:g> battery</string>
 
     <!-- [CHAR_LIMIT=40] Battery percentage: Title -->
-    <string name="battery_percentage">Battery percentage</string>
+    <string name="battery_info">Battery Information</string>
     <!-- [CHAR_LIMIT=NONE] Battery percentage: Description for preference -->
-    <string name="battery_percentage_description">Show battery percentage in status bar</string>
+    <string name="battery_info_description">Show percentage and time left before charge is needed</string>
 
     <!-- Process Stats strings -->
     <skip />

res/xml/power_usage_summary.xml

diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index b4db4ed..48e1276 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -50,8 +50,8 @@
 
     <SwitchPreference
         android:key="battery_percentage"
-        android:title="@string/battery_percentage"
-        android:summary="@string/battery_percentage_description"
+        android:title="@string/battery_info"
+        android:summary="@string/battery_info_description"
         settings:controller="com.android.settings.display.BatteryPercentagePreferenceController" />