commit 29e99d201008e3cd4a4b64df44ebf70550a6dd88
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 19 16:58:17 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 19 16:58:17 2018 +0000
tree 802e706f9501d1673100eeac26db2b3e36fdb4b9
parent a28a3cc2e4f73035cb136320fffe0d5c59cb31ff
parent d779db40093cb86a8495cf2169a92546c1bfdfe1

Merge "Move functions to settingslib for more code reuse"

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b4d4203..41b3a80 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5943,8 +5943,8 @@
 
     <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
     <string name="data_usage_summary_title">Data usage</string>
-    <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
-    <string name="data_usage_app_summary_title">App data usage</string>
+    <!-- Activity title Mobile data & WI-FI summary. [CHAR LIMIT=25] -->
+    <string name="data_usage_app_summary_title">Mobile data &amp; Wi\u2011Fi</string>
     <!-- Message about carrier data accounting.  [CHAR LIMIT=100] -->
     <string name="data_usage_accounting">Carrier data accounting may differ from your device.</string>
     <!-- Title for app usage. [CHAR LIMIT=40] -->

res/xml/app_info_settings.xml

diff --git a/res/xml/app_info_settings.xml b/res/xml/app_info_settings.xml
index 9d77e86..684d032 100644
--- a/res/xml/app_info_settings.xml
+++ b/res/xml/app_info_settings.xml
@@ -63,7 +63,7 @@
 
     <Preference
         android:key="data_settings"
-        android:title="@string/data_usage_summary_title"
+        android:title="@string/data_usage_app_summary_title"
         android:summary="@string/summary_placeholder"
         settings:controller="com.android.settings.applications.appinfo.AppDataUsagePreferenceController" />