summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-02-03 14:50:33 -0800
committerJeff Sharkey <jsharkey@android.com>2012-02-03 14:50:33 -0800
commit77dae91726864c2c88ac317aff6bd086ca468e54 (patch)
treee65365b6bcc45a423ee246874ec039a910499638 /src/com/android/settings
parent5c474987ae12b705ecf5310134f72f030f15bc2d (diff)
downloadpackages_apps_settings-77dae91726864c2c88ac317aff6bd086ca468e54.zip
packages_apps_settings-77dae91726864c2c88ac317aff6bd086ca468e54.tar.gz
packages_apps_settings-77dae91726864c2c88ac317aff6bd086ca468e54.tar.bz2
Unify shorthand for byte-based units.
Change-Id: I32f998b5ee1f5416c9cceafd124fd34b7433be42
Diffstat (limited to 'src/com/android/settings')
-rw-r--r--src/com/android/settings/DataUsageSummary.java6
-rw-r--r--src/com/android/settings/widget/ChartDataUsageView.java7
2 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 9db6391..ce8f291 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -36,6 +36,8 @@ import static android.net.NetworkTemplate.buildTemplateMobile3gLower;
import static android.net.NetworkTemplate.buildTemplateMobile4g;
import static android.net.NetworkTemplate.buildTemplateMobileAll;
import static android.net.NetworkTemplate.buildTemplateWifi;
+import static android.net.TrafficStats.GB_IN_BYTES;
+import static android.net.TrafficStats.MB_IN_BYTES;
import static android.net.TrafficStats.UID_REMOVED;
import static android.net.TrafficStats.UID_TETHERING;
import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
@@ -171,10 +173,6 @@ public class DataUsageSummary extends Fragment {
private static final int LOADER_CHART_DATA = 2;
private static final int LOADER_SUMMARY = 3;
- private static final long KB_IN_BYTES = 1024;
- private static final long MB_IN_BYTES = KB_IN_BYTES * 1024;
- private static final long GB_IN_BYTES = MB_IN_BYTES * 1024;
-
private INetworkManagementService mNetworkService;
private INetworkStatsService mStatsService;
private INetworkPolicyManager mPolicyService;
diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java
index f10ea5e..28fbd00 100644
--- a/src/com/android/settings/widget/ChartDataUsageView.java
+++ b/src/com/android/settings/widget/ChartDataUsageView.java
@@ -16,6 +16,9 @@
package com.android.settings.widget;
+import static android.net.TrafficStats.GB_IN_BYTES;
+import static android.net.TrafficStats.MB_IN_BYTES;
+
import android.content.Context;
import android.content.res.Resources;
import android.net.NetworkPolicy;
@@ -40,10 +43,6 @@ import com.android.settings.widget.ChartSweepView.OnSweepListener;
*/
public class ChartDataUsageView extends ChartView {
- private static final long KB_IN_BYTES = 1024;
- private static final long MB_IN_BYTES = KB_IN_BYTES * 1024;
- private static final long GB_IN_BYTES = MB_IN_BYTES * 1024;
-
private static final int MSG_UPDATE_AXIS = 100;
private static final long DELAY_MILLIS = 250;