commit 6a41da8e9a6fb016cd93f991d65cf8334fb1d3a2
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 13 23:36:28 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 13 23:36:28 2016 +0000
tree bc829eeb9833e60808c723d19952463e62daf372
parent 40c2e7adcfd366c2de8691e04fb6663a79c0b872
parent 1e890cb8f7a7d120988200ff3dde19d3e1ec99dc

Merge "Data Saver Mode phrasing tweaks." into nyc-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a1db172..ce0a4a6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7194,7 +7194,7 @@
     <string name="network_restrictions">Network restrictions</string>
 
     <!-- A summary shown on data usage screens to indicate inaccuracy of data tracking [CHAR LIMIT=NONE] -->
-    <string name="operator_warning">Operator data accounting may differ from your device.</string>
+    <string name="operator_warning">Carrier data accounting may differ from device accounting</string>
 
     <!-- Format string describing how much data has been used [CHAR LIMIT=20] -->
     <string name="data_used_template"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> used</string>
@@ -7218,22 +7218,22 @@
          the code to do that -->
     <string name="data_usage_other_apps" translatable="false">Other apps included in usage</string>
 
-    <!-- Description of number of apps allowed to ignore data saver [CHAR LIMIT=NONE] -->
+    <!-- Description of number of apps allowed to ignore Data Saver [CHAR LIMIT=NONE] -->
     <plurals name="data_saver_unrestricted_summary">
         <item quantity="one">1 app allowed to use unrestricted data when Data Saver is on</item>
         <item quantity="other"><xliff:g id="count" example="10">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
     </plurals>
 
     <!-- Name of Data Saver screens [CHAR LIMIT=30] -->
-    <string name="data_saver_title">Data Saver</string>
+    <string name="data_saver_title">Data saver</string>
 
     <!-- Button that leads to list of apps with unrestricted data access [CHAR LIMIT=60] -->
     <string name="unrestricted_data_saver">Unrestricted data access</string>
 
-    <!-- Summary for the data saver feature being on [CHAR LIMIT=NONE] -->
+    <!-- Summary for the Data Saver feature being on [CHAR LIMIT=NONE] -->
     <string name="data_saver_on">On</string>
 
-    <!-- Summary for the data saver feature being off [CHAR LIMIT=NONE] -->
+    <!-- Summary for the Data Saver feature being off [CHAR LIMIT=NONE] -->
     <string name="data_saver_off">Off</string>
 
     <!-- Title for switch to allow app unrestricted data usage [CHAR LIMIT=30] -->

res/xml/data_saver.xml

diff --git a/res/xml/data_saver.xml b/res/xml/data_saver.xml
index 5b69cbb..20ce5c8 100644
--- a/res/xml/data_saver.xml
+++ b/res/xml/data_saver.xml
@@ -15,11 +15,20 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/data_saver_title">
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
+        android:title="@string/data_saver_title">
 
     <Preference
         android:key="unrestricted_access"
         android:title="@string/unrestricted_data_saver"
         android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" />
 
+    <!-- Feature description text -->
+    <com.android.settings.fuelgauge.WallOfTextPreference
+            android:key="description"
+            android:summary="@*android:string/data_saver_description"
+            android:persistent="false"
+            android:selectable="false"
+            settings:allowDividerAbove="true" />
+
 </PreferenceScreen>