Merge "Change data usage warning notification wording."

Author: jsharkey

core/res/res/values/strings.xml

@@ -3221,7 +3221,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>

services/java/com/android/server/net/NetworkPolicyManagerService.java

@@ -572,8 +572,7 @@ private void enqueueNotification(NetworkPolicy policy, int type, long totalBytes
         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);