From abb3b1cf6ac1d065b5d2e8a493e89d713bbf82a8 Mon Sep 17 00:00:00 2001
From: SunnyShao <sunnyshao@google.com>
Date: Tue, 17 Jul 2018 18:42:30 +0800
Subject: [PATCH] Fixed data usage displaying problem

- Changed "Data usage" to "Mobile data & Wi-Fi" in App info page
- Chageed the title "App data usage" to "Mobile data & Wi-Fi"

Change-Id: I7699465ca5c7b1786c6f9e33bc25a2dd70181ce6
Fixes: 34515307
Test: visual
---
 res/values/strings.xml        | 4 ++--
 res/xml/app_info_settings.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index bacfd187365..4379b1a80a6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5965,8 +5965,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] -->
diff --git a/res/xml/app_info_settings.xml b/res/xml/app_info_settings.xml
index 9d77e865692..684d0325417 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" />