summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-07-26 19:30:26 -0700
committerJeff Sharkey <jsharkey@android.com>2011-07-27 21:11:39 -0700
commitd360e5efaaf4ea5f487a84787210a6c5d26337a8 (patch)
tree722de8ff75229978b1a1002a91e0b97caa6ea392 /res/values
parent271ec8a8f81ab714e45cc8c7814ea3c5dfb3f36a (diff)
downloadpackages_apps_Settings-d360e5efaaf4ea5f487a84787210a6c5d26337a8.tar.gz
packages_apps_Settings-d360e5efaaf4ea5f487a84787210a6c5d26337a8.tar.bz2
packages_apps_Settings-d360e5efaaf4ea5f487a84787210a6c5d26337a8.zip
Data usage fit and finish.
Show time range and data summary based on current sweep selection for both network and app details. Fix animations by opting-out of parent hierarchy animation, since it fights with ListView. Switch to using NPMS "restrict background" instead of overloading setBackgroundDataSetting(), and hide app background checkbox when global background is restricted. Limit sweeps to valid historical data, and activate sweeps on touch instead of requiring separate tap. Fix z-order and avoid animating sweeps. Align all elements along vertical edge, and fix item layout to handle long app title. Bug: 4979025, 5058107, 5038590, 5079887, 5058108, 5058026, 5037381 Change-Id: Ib45b61ff2a62303f47aa3f47f88d2e688fe4d076
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 249961e3a..f846e1994 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3464,6 +3464,8 @@ found in the list of installed applications.</string>
<string name="data_usage_uninstalled_apps">Removed apps</string>
<!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
<string name="data_usage_received_sent"><xliff:g id="received" example="128KB">%1$s</xliff:g> received, <xliff:g id="sent" example="1.3GB">%2$s</xliff:g> sent</string>
+ <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
+ <string name="data_usage_total_during_range">Data usage: <xliff:g id="total" example="128KB">%1$s</xliff:g> between <xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g></string>
<!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
<string name="cryptkeeper_emergency_call">Emergency call</string>