summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-07-20 16:59:16 -0700
committerJeff Sharkey <jsharkey@android.com>2011-07-27 09:31:51 -0700
commit271ec8a8f81ab714e45cc8c7814ea3c5dfb3f36a (patch)
treeaae3a11864382d9857e9dc16aa5635001e21afab /res
parent7485addd8c230812b33f7043de3ff47d97b79bc1 (diff)
downloadpackages_apps_settings-271ec8a8f81ab714e45cc8c7814ea3c5dfb3f36a.zip
packages_apps_settings-271ec8a8f81ab714e45cc8c7814ea3c5dfb3f36a.tar.gz
packages_apps_settings-271ec8a8f81ab714e45cc8c7814ea3c5dfb3f36a.tar.bz2
Move data over-limit dialog, reset policy snooze.
Moved over-limit dialog to SystemUI, and followed Intent changes to read full NetworkTemplate. When mutating NetworkPolicy, always reset any snooze. Bug: 5057979, 4723336 Change-Id: I9a975eb4ced2f4020c2fe74af67625541cbfcd85
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cd5ac0b..249961e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3450,17 +3450,6 @@ found in the list of installed applications.</string>
<!-- Body of dialog shown before user limits 4G data usage. [CHAR LIMIT=NONE] -->
<string name="data_usage_limit_dialog_4g">Your 4G data connection will be disabled when the specified limit is reached.\n\nTo avoid overage charges, consider using a reduced limit, as device and carrier accounting methods may vary.</string>
- <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
- <string name="data_usage_disabled_dialog_3g_title">2G-3G data disabled</string>
- <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
- <string name="data_usage_disabled_dialog_4g_title">4G data disabled</string>
- <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
- <string name="data_usage_disabled_dialog_mobile_title">Mobile data disabled</string>
- <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
- <string name="data_usage_disabled_dialog">The specified data usage limit has been reached.\n\nAdditional data use may incur carrier charges.</string>
- <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
- <string name="data_usage_disabled_dialog_enable">Re-enable data</string>
-
<!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] -->
<string name="data_usage_restrict_background_title">Restricting background data</string>
<!-- Body of dialog shown before user restricts background data usage. [CHAR LIMIT=NONE] -->