From 8ca953da93eb8679574abba535f75f72d50016f2 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 14 Sep 2011 19:56:11 -0700
Subject: [PATCH] Change data usage warning notification wording.

Bug: 5308710
Change-Id: Ic807640a031a3edb03897634e638473d5a039ecc
---
 core/res/res/values/strings.xml                                | 2 +-
 .../com/android/server/net/NetworkPolicyManagerService.java    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index eeff473a8e7dd..812b051780719 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -3218,7 +3218,7 @@
     <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
     <string name="data_usage_warning_title">Data usage warning</string>
     <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
-    <string name="data_usage_warning_body">usage exceeds <xliff:g id="size" example="3.8GB">%s</xliff:g></string>
+    <string name="data_usage_warning_body">Touch to view usage and settings</string>
 
     <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
     <string name="data_usage_3g_limit_title">2G-3G data disabled</string>
diff --git a/services/java/com/android/server/net/NetworkPolicyManagerService.java b/services/java/com/android/server/net/NetworkPolicyManagerService.java
index 9067faebdc4b7..0da5cc631e418 100644
--- a/services/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -572,8 +572,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
         switch (type) {
             case TYPE_WARNING: {
                 final CharSequence title = res.getText(R.string.data_usage_warning_title);
-                final CharSequence body = res.getString(R.string.data_usage_warning_body,
-                        Formatter.formatFileSize(mContext, policy.warningBytes));
+                final CharSequence body = res.getString(R.string.data_usage_warning_body);
 
                 builder.setSmallIcon(R.drawable.ic_menu_info_details);
                 builder.setTicker(title);