diff options
| author | 2011-09-14 20:27:55 -0700 | |
|---|---|---|
| committer | 2011-09-14 20:27:55 -0700 | |
| commit | 6f13746633e089d3468dbb8620f222ce6c140bd3 (patch) | |
| tree | 486dd8166e0f37b78bc9c59dcf859a8ea8a3cd0c | |
| parent | 428dd26cd5fcf178bb326031d3646bbd73ed3fcd (diff) | |
| parent | 8ca953da93eb8679574abba535f75f72d50016f2 (diff) | |
Merge "Change data usage warning notification wording."
| -rwxr-xr-x | core/res/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | services/java/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 6e72fd73cdda..87cfa38f3cf7 100755 --- a/core/res/res/values/strings.xml +++ b/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> diff --git a/services/java/com/android/server/net/NetworkPolicyManagerService.java b/services/java/com/android/server/net/NetworkPolicyManagerService.java index 9067faebdc4b..0da5cc631e41 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); |