From 77dae91726864c2c88ac317aff6bd086ca468e54 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Fri, 3 Feb 2012 14:50:33 -0800 Subject: [PATCH] Unify shorthand for byte-based units. Change-Id: I32f998b5ee1f5416c9cceafd124fd34b7433be42 --- src/com/android/settings/DataUsageSummary.java | 6 ++---- src/com/android/settings/widget/ChartDataUsageView.java | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index 9db63913838..ce8f291045d 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 f10ea5e5838..28fbd000f7c 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;