summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/net
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-06-23 22:15:54 -0700
committerJeff Sharkey <jsharkey@android.com>2011-06-23 22:30:05 -0700
commitf54f435f1f3215b39798c671fc64344d1867de4e (patch)
tree2bb886af30f4ff69b414875f68b7d9ad93076bbb /src/com/android/settings/net
parent255e71eb53255b540e7a061d8c7ee7d768e15d2e (diff)
downloadpackages_apps_Settings-f54f435f1f3215b39798c671fc64344d1867de4e.zip
packages_apps_Settings-f54f435f1f3215b39798c671fc64344d1867de4e.tar.gz
packages_apps_Settings-f54f435f1f3215b39798c671fc64344d1867de4e.tar.bz2
More data usage chart iteration, app details.
Moved app details back into single Fragment to support animations and template tabs. Show the network in background behind app details chart series to match designs. Clamping sweeps at axis boundaries. Bug: 4813014, 4598460, 4818029 Change-Id: I72c0b21ee1d595e4da31d293ae0dab9e801041f3
Diffstat (limited to 'src/com/android/settings/net')
-rw-r--r--src/com/android/settings/net/NetworkPolicyEditor.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/settings/net/NetworkPolicyEditor.java b/src/com/android/settings/net/NetworkPolicyEditor.java
index c50a490..61c2550 100644
--- a/src/com/android/settings/net/NetworkPolicyEditor.java
+++ b/src/com/android/settings/net/NetworkPolicyEditor.java
@@ -16,6 +16,8 @@
package com.android.settings.net;
+import static android.net.NetworkPolicy.LIMIT_DISABLED;
+import static android.net.NetworkPolicy.WARNING_DISABLED;
import static android.net.NetworkTemplate.MATCH_MOBILE_3G_LOWER;
import static android.net.NetworkTemplate.MATCH_MOBILE_4G;
import static android.net.NetworkTemplate.MATCH_MOBILE_ALL;
@@ -51,6 +53,14 @@ public class NetworkPolicyEditor {
final NetworkPolicy[] policies = mPolicyService.getNetworkPolicies();
mPolicies.clear();
for (NetworkPolicy policy : policies) {
+ // TODO: find better place to clamp these
+ if (policy.limitBytes < -1) {
+ policy.limitBytes = LIMIT_DISABLED;
+ }
+ if (policy.warningBytes < -1) {
+ policy.warningBytes = WARNING_DISABLED;
+ }
+
mPolicies.add(policy);
}
} catch (RemoteException e) {