From aa5a8a6a4c2e8d7ef9777b1aa69aa10501162104 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Mon, 6 Jun 2016 16:39:55 -0400
Subject: [PATCH] Fix data usage format strings

Bug: 28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e
---
 res/values/strings.xml                                   | 6 +++---
 src/com/android/settings/datausage/DataUsageSummary.java | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ad4c670c11b..41c2dfda887 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7238,13 +7238,13 @@
     <string name="ethernet">Ethernet</string>
 
     <!-- Format string for amount of cellular data used [CHAR LIMIT=30] -->
-    <string name="cell_data_template"><xliff:g name="units" example="GB">%1$s</xliff:g> cellular data</string>
+    <string name="cell_data_template"><xliff:g id="number" example="128">^1</xliff:g><small><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></small><small><small> cellular data</small></small></string>
 
     <!-- Format string for amount of wifi data used [CHAR LIMIT=30] -->
-    <string name="wifi_data_template"><xliff:g name="units" example="GB">%1$s</xliff:g> Wi-Fi data</string>
+    <string name="wifi_data_template"><xliff:g id="number" example="128">^1</xliff:g><small><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></small><small><small> Wi-Fi data</small></small></string>
 
     <!-- Format string for amount of ethernet data used [CHAR LIMIT=30] -->
-    <string name="ethernet_data_template"><xliff:g name="units" example="GB">%1$s</xliff:g> ethernet data</string>
+    <string name="ethernet_data_template"><xliff:g id="number" example="128">^1</xliff:g><small><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></small><small><small> ethernet data</small></small></string>
 
     <!-- Format for a summary describing the amount of data before the user is warned [CHAR LIMIT=NONE] -->
     <string name="cell_warning_only"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> Data warning</string>
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index bd6ae5c9fc1..51804c132de 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -32,6 +32,7 @@ import android.support.v7.preference.PreferenceScreen;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.text.TextUtils;
 import android.text.format.Formatter;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -189,8 +190,8 @@ public class DataUsageSummary extends DataUsageBase implements Indexable {
         if (mSummaryPreference != null) {
             Formatter.BytesResult usedResult = Formatter.formatBytes(context.getResources(),
                     info.usageLevel, Formatter.FLAG_SHORTER);
-            mSummaryPreference.setAmount(usedResult.value);
-            mSummaryPreference.setUnits(getString(mDataUsageTemplate, usedResult.units));
+            mSummaryPreference.setTitle(TextUtils.expandTemplate(getText(mDataUsageTemplate),
+                    usedResult.value, usedResult.units));
             long limit = info.limitLevel;
             if (limit <= 0) {
                 limit = info.warningLevel;