From 289677f97f8816cb85bd627f3a5403b8bceb2dde Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 11 Apr 2018 13:59:12 -0700 Subject: [PATCH] Switch from SI to IEC unit when formatting data usage bytes - Created a new helper method DataUsageUtils.formatDataUsage() to format data usage bytes using IEC formatting. - Switch from Formatter.formatFileSize() to DataUsageUtils.formatDataUsage() everywhere in datausage package. Change-Id: I9323beed8bf5126b153fc9a3cdd9591c97ca6fd2 Bug: 76159924 Test: robotests --- .../settings/datausage/AppDataUsage.java | 7 ++- .../datausage/AppDataUsagePreference.java | 3 +- .../datausage/BillingCycleSettings.java | 22 ++++---- .../datausage/ChartDataUsagePreference.java | 3 +- .../settings/datausage/DataUsageList.java | 3 +- .../datausage/DataUsagePreference.java | 5 +- .../settings/datausage/DataUsageSummary.java | 16 +++--- .../datausage/DataUsageSummaryPreference.java | 22 ++++---- .../DataUsageSummaryPreferenceController.java | 54 ++++--------------- .../settings/datausage/DataUsageUtils.java | 15 +++++- .../datausage/BillingCycleSettingsTest.java | 1 + ...aUsageSummaryPreferenceControllerTest.java | 29 +++++----- .../DataUsageSummaryPreferenceTest.java | 21 ++++---- .../datausage/DataUsageSummaryTest.java | 28 +++++----- .../datausage/DataUsageUtilsTest.java | 9 ++++ 15 files changed, 109 insertions(+), 129 deletions(-) diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index a0d0ec03551..760692f2562 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -35,7 +35,6 @@ import android.os.UserHandle; import android.support.annotation.VisibleForTesting; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceCategory; -import android.text.format.Formatter; import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; @@ -308,9 +307,9 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen final long totalBytes = backgroundBytes + foregroundBytes; final Context context = getContext(); - mTotalUsage.setSummary(Formatter.formatFileSize(context, totalBytes)); - mForegroundUsage.setSummary(Formatter.formatFileSize(context, foregroundBytes)); - mBackgroundUsage.setSummary(Formatter.formatFileSize(context, backgroundBytes)); + mTotalUsage.setSummary(DataUsageUtils.formatDataUsage(context, totalBytes)); + mForegroundUsage.setSummary(DataUsageUtils.formatDataUsage(context, foregroundBytes)); + mBackgroundUsage.setSummary(DataUsageUtils.formatDataUsage(context, backgroundBytes)); } private boolean getAppRestrictBackground() { diff --git a/src/com/android/settings/datausage/AppDataUsagePreference.java b/src/com/android/settings/datausage/AppDataUsagePreference.java index f0fd755f617..e34aaeeea52 100644 --- a/src/com/android/settings/datausage/AppDataUsagePreference.java +++ b/src/com/android/settings/datausage/AppDataUsagePreference.java @@ -16,7 +16,6 @@ package com.android.settings.datausage; import android.content.Context; import android.support.v7.preference.PreferenceViewHolder; -import android.text.format.Formatter; import android.view.View; import android.widget.ProgressBar; @@ -41,7 +40,7 @@ public class AppDataUsagePreference extends AppPreference { if (item.restricted && item.total <= 0) { setSummary(com.android.settings.R.string.data_usage_app_restricted); } else { - setSummary(Formatter.formatFileSize(context, item.total)); + setSummary(DataUsageUtils.formatDataUsage(context, item.total)); } mDetail = provider.getUidDetail(item.key, false /* blocking */); if (mDetail != null) { diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index 971d9fc51e1..b82e3becef4 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -29,7 +29,6 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; -import android.text.format.Formatter; import android.text.format.Time; import android.util.FeatureFlagUtils; import android.util.Log; @@ -52,11 +51,10 @@ public class BillingCycleSettings extends DataUsageBase implements private static final String TAG = "BillingCycleSettings"; private static final boolean LOGD = false; - public static final long KB_IN_BYTES = 1000; - public static final long MB_IN_BYTES = KB_IN_BYTES * 1000; - public static final long GB_IN_BYTES = MB_IN_BYTES * 1000; + public static final long MIB_IN_BYTES = 1024 * 1024; + public static final long GIB_IN_BYTES = MIB_IN_BYTES * 1024; - private static final long MAX_DATA_LIMIT_BYTES = 50000 * GB_IN_BYTES; + private static final long MAX_DATA_LIMIT_BYTES = 50000 * GIB_IN_BYTES; private static final String TAG_CONFIRM_LIMIT = "confirmLimit"; private static final String TAG_CYCLE_EDITOR = "cycleEditor"; @@ -130,7 +128,7 @@ public class BillingCycleSettings extends DataUsageBase implements } final long warningBytes = services.mPolicyEditor.getPolicyWarningBytes(mNetworkTemplate); if (warningBytes != WARNING_DISABLED) { - mDataWarning.setSummary(Formatter.formatFileSize(getContext(), warningBytes)); + mDataWarning.setSummary(DataUsageUtils.formatDataUsage(getContext(), warningBytes)); mDataWarning.setEnabled(true); mEnableDataWarning.setChecked(true); } else { @@ -140,7 +138,7 @@ public class BillingCycleSettings extends DataUsageBase implements } final long limitBytes = services.mPolicyEditor.getPolicyLimitBytes(mNetworkTemplate); if (limitBytes != LIMIT_DISABLED) { - mDataLimit.setSummary(Formatter.formatFileSize(getContext(), limitBytes)); + mDataLimit.setSummary(DataUsageUtils.formatDataUsage(getContext(), limitBytes)); mDataLimit.setEnabled(true); mEnableDataLimit.setChecked(true); } else { @@ -275,14 +273,14 @@ public class BillingCycleSettings extends DataUsageBase implements : editor.getPolicyWarningBytes(template); final long limitDisabled = isLimit ? LIMIT_DISABLED : WARNING_DISABLED; - if (bytes > 1.5f * GB_IN_BYTES) { - final String bytesText = formatText(bytes / (float) GB_IN_BYTES); + if (bytes > 1.5f * GIB_IN_BYTES) { + final String bytesText = formatText(bytes / (float) GIB_IN_BYTES); bytesPicker.setText(bytesText); bytesPicker.setSelection(0, bytesText.length()); type.setSelection(1); } else { - final String bytesText = formatText(bytes / (float) MB_IN_BYTES); + final String bytesText = formatText(bytes / (float) MIB_IN_BYTES); bytesPicker.setText(bytesText); bytesPicker.setSelection(0, bytesText.length()); @@ -313,7 +311,7 @@ public class BillingCycleSettings extends DataUsageBase implements bytesString = "0"; } final long bytes = (long) (Float.valueOf(bytesString) - * (spinner.getSelectedItemPosition() == 0 ? MB_IN_BYTES : GB_IN_BYTES)); + * (spinner.getSelectedItemPosition() == 0 ? MIB_IN_BYTES : GIB_IN_BYTES)); // to fix the overflow problem final long correctedBytes = Math.min(MAX_DATA_LIMIT_BYTES, bytes); @@ -422,7 +420,7 @@ public class BillingCycleSettings extends DataUsageBase implements // TODO: customize default limits based on network template message = res.getString(R.string.data_usage_limit_dialog_mobile); - limitBytes = Math.max(5 * GB_IN_BYTES, minLimitBytes); + limitBytes = Math.max(5 * GIB_IN_BYTES, minLimitBytes); final Bundle args = new Bundle(); args.putCharSequence(EXTRA_MESSAGE, message); diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java index a6d04b65174..3ddfd47828c 100644 --- a/src/com/android/settings/datausage/ChartDataUsagePreference.java +++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java @@ -27,6 +27,7 @@ import android.text.format.Formatter; import android.text.style.ForegroundColorSpan; import android.util.AttributeSet; import android.util.SparseIntArray; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.graph.UsageView; @@ -155,7 +156,7 @@ public class ChartDataUsagePreference extends Preference { private CharSequence getLabel(long bytes, int str, int mLimitColor) { Formatter.BytesResult result = Formatter.formatBytes(getContext().getResources(), - bytes, Formatter.FLAG_SHORTER); + bytes, Formatter.FLAG_SHORTER | Formatter.FLAG_IEC_UNITS); CharSequence label = TextUtils.expandTemplate(getContext().getText(str), result.value, result.units); return new SpannableStringBuilder().append(label, new ForegroundColorSpan(mLimitColor), 0); diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java index 2f676bafb47..8c771981cdd 100644 --- a/src/com/android/settings/datausage/DataUsageList.java +++ b/src/com/android/settings/datausage/DataUsageList.java @@ -48,7 +48,6 @@ import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.format.DateUtils; -import android.text.format.Formatter; import android.util.Log; import android.util.SparseArray; import android.view.View; @@ -329,7 +328,7 @@ public class DataUsageList extends DataUsageBase { SummaryForAllUidLoader.buildArgs(mTemplate, start, end), mSummaryCallbacks); final long totalBytes = entry != null ? entry.rxBytes + entry.txBytes : 0; - final String totalPhrase = Formatter.formatFileSize(context, totalBytes); + final CharSequence totalPhrase = DataUsageUtils.formatDataUsage(context, totalBytes); mUsageAmount.setTitle(getString(R.string.data_used_template, totalPhrase)); } diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java index e6685077684..766a2a985b1 100644 --- a/src/com/android/settings/datausage/DataUsagePreference.java +++ b/src/com/android/settings/datausage/DataUsagePreference.java @@ -21,7 +21,6 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.support.v4.content.res.TypedArrayUtils; import android.support.v7.preference.Preference; -import android.text.format.Formatter; import android.util.AttributeSet; import android.util.FeatureFlagUtils; @@ -61,13 +60,13 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc } else { setTitle(mTitleRes); setSummary(getContext().getString(R.string.data_usage_template, - Formatter.formatFileSize(getContext(), usageInfo.usageLevel), + DataUsageUtils.formatDataUsage(getContext(), usageInfo.usageLevel), usageInfo.period)); } } else { setTitle(mTitleRes); setSummary(getContext().getString(R.string.data_usage_template, - Formatter.formatFileSize(getContext(), usageInfo.usageLevel), + DataUsageUtils.formatDataUsage(getContext(), usageInfo.usageLevel), usageInfo.period)); } setIntent(getIntent()); diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index 02e626888a8..bfde89e9d0a 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -14,7 +14,6 @@ package com.android.settings.datausage; -import android.util.Log; import android.app.Activity; import android.content.ComponentName; import android.content.Context; @@ -28,7 +27,6 @@ import android.support.v7.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.SubscriptionPlan; -import android.telephony.TelephonyManager; import android.text.BidiFormatter; import android.text.Spannable; import android.text.SpannableString; @@ -233,7 +231,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements Indexable final int FLAGS = Spannable.SPAN_INCLUSIVE_INCLUSIVE; final Formatter.BytesResult usedResult = Formatter.formatBytes(context.getResources(), - usageLevel, Formatter.FLAG_CALCULATE_ROUNDED); + usageLevel, Formatter.FLAG_CALCULATE_ROUNDED | Formatter.FLAG_IEC_UNITS); final SpannableString enlargedValue = new SpannableString(usedResult.value); enlargedValue.setSpan(new RelativeSizeSpan(larger), 0, enlargedValue.length(), FLAGS); @@ -311,7 +309,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements Indexable final CharSequence wifiFormat = mActivity .getText(R.string.data_usage_wifi_format); final CharSequence sizeText = - Formatter.formatFileSize(mActivity, info.usageLevel); + DataUsageUtils.formatDataUsage(mActivity, info.usageLevel); mSummaryLoader.setSummary(this, TextUtils.expandTemplate(wifiFormat, sizeText)); } @@ -319,7 +317,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements Indexable } } - private String formatUsedData() { + private CharSequence formatUsedData() { SubscriptionManager subscriptionManager = (SubscriptionManager) mActivity .getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE); int defaultSubId = subscriptionManager.getDefaultSubscriptionId(); @@ -332,19 +330,19 @@ public class DataUsageSummary extends DataUsageBaseFragment implements Indexable return formatFallbackData(); } if (DataUsageSummaryPreferenceController.unlimited(dfltPlan.getDataLimitBytes())) { - return Formatter.formatFileSize(mActivity, dfltPlan.getDataUsageBytes()); + return DataUsageUtils.formatDataUsage(mActivity, dfltPlan.getDataUsageBytes()); } else { return Utils.formatPercentage(dfltPlan.getDataUsageBytes(), dfltPlan.getDataLimitBytes()); } } - private String formatFallbackData() { + private CharSequence formatFallbackData() { DataUsageController.DataUsageInfo info = mDataController.getDataUsageInfo(); if (info == null) { - return Formatter.formatFileSize(mActivity, 0); + return DataUsageUtils.formatDataUsage(mActivity, 0); } else if (info.limitLevel <= 0) { - return Formatter.formatFileSize(mActivity, info.usageLevel); + return DataUsageUtils.formatDataUsage(mActivity, info.usageLevel); } else { return Utils.formatPercentage(info.usageLevel, info.limitLevel); } diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index 253a3fb2fb5..86297eb95cb 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -39,7 +39,6 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; -import com.android.settingslib.AppItem; import com.android.settingslib.Utils; import com.android.settingslib.utils.StringUtil; @@ -52,12 +51,13 @@ import java.util.concurrent.TimeUnit; public class DataUsageSummaryPreference extends Preference { private static final long MILLIS_IN_A_DAY = TimeUnit.DAYS.toMillis(1); private static final long WARNING_AGE = TimeUnit.HOURS.toMillis(6L); - @VisibleForTesting static final Typeface SANS_SERIF_MEDIUM = + @VisibleForTesting + static final Typeface SANS_SERIF_MEDIUM = Typeface.create("sans-serif-medium", Typeface.NORMAL); private boolean mChartEnabled = true; - private String mStartLabel; - private String mEndLabel; + private CharSequence mStartLabel; + private CharSequence mEndLabel; /** large vs small size is 36/16 ~ 2.25 */ private static final float LARGER_FONT_RATIO = 2.25f; @@ -126,7 +126,7 @@ public class DataUsageSummaryPreference extends Preference { } } - public void setLabels(String start, String end) { + public void setLabels(CharSequence start, CharSequence end) { mStartLabel = start; mEndLabel = end; notifyChanged(); @@ -215,7 +215,7 @@ public class DataUsageSummaryPreference extends Preference { TextView usageNumberField = (TextView) holder.findViewById(R.id.data_usage_view); final Formatter.BytesResult usedResult = Formatter.formatBytes(getContext().getResources(), - mDataplanUse, Formatter.FLAG_CALCULATE_ROUNDED); + mDataplanUse, Formatter.FLAG_CALCULATE_ROUNDED | Formatter.FLAG_IEC_UNITS); final SpannableString usageNumberText = new SpannableString(usedResult.value); final int textSize = getContext().getResources().getDimensionPixelSize(R.dimen.usage_number_text_size); @@ -233,13 +233,13 @@ public class DataUsageSummaryPreference extends Preference { if (dataRemaining >= 0) { usageRemainingField.setText( TextUtils.expandTemplate(getContext().getText(R.string.data_remaining), - Formatter.formatFileSize(getContext(), dataRemaining))); + DataUsageUtils.formatDataUsage(getContext(), dataRemaining))); usageRemainingField.setTextColor( Utils.getColorAttr(getContext(), android.R.attr.colorAccent)); } else { usageRemainingField.setText( TextUtils.expandTemplate(getContext().getText(R.string.data_overusage), - Formatter.formatFileSize(getContext(), -dataRemaining))); + DataUsageUtils.formatDataUsage(getContext(), -dataRemaining))); usageRemainingField.setTextColor( Utils.getColorAttr(getContext(), android.R.attr.colorError)); } @@ -253,10 +253,10 @@ public class DataUsageSummaryPreference extends Preference { if (millisLeft <= 0) { cycleTime.setText(getContext().getString(R.string.billing_cycle_none_left)); } else { - int daysLeft = (int)(millisLeft / MILLIS_IN_A_DAY); + int daysLeft = (int) (millisLeft / MILLIS_IN_A_DAY); cycleTime.setText(daysLeft < 1 - ? getContext().getString(R.string.billing_cycle_less_than_one_day_left) - : getContext().getResources().getQuantityString( + ? getContext().getString(R.string.billing_cycle_less_than_one_day_left) + : getContext().getResources().getQuantityString( R.plurals.billing_cycle_days_left, daysLeft, daysLeft)); } } diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java index 95c183e5142..14b97170dfc 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java @@ -23,20 +23,16 @@ import android.net.NetworkPolicyManager; import android.net.NetworkTemplate; import android.support.annotation.VisibleForTesting; import android.support.v7.preference.Preference; +import android.support.v7.widget.RecyclerView; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.SubscriptionPlan; -import android.text.BidiFormatter; -import android.text.Spannable; -import android.text.SpannableString; import android.text.TextUtils; import android.text.format.Formatter; -import android.text.style.RelativeSizeSpan; import android.util.Log; import android.util.RecurrenceRule; import com.android.internal.util.CollectionUtils; -import android.support.v7.widget.RecyclerView; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerMixin; @@ -220,18 +216,18 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll } if (info.warningLevel > 0 && info.limitLevel > 0) { - summaryPreference.setLimitInfo(TextUtils.expandTemplate( - mContext.getText(R.string.cell_data_warning_and_limit), - Formatter.formatFileSize(mContext, info.warningLevel), - Formatter.formatFileSize(mContext, info.limitLevel))); + summaryPreference.setLimitInfo(TextUtils.expandTemplate( + mContext.getText(R.string.cell_data_warning_and_limit), + DataUsageUtils.formatDataUsage(mContext, info.warningLevel), + DataUsageUtils.formatDataUsage(mContext, info.limitLevel))); } else if (info.warningLevel > 0) { - summaryPreference.setLimitInfo(TextUtils.expandTemplate( - mContext.getText(R.string.cell_data_warning), - Formatter.formatFileSize(mContext, info.warningLevel))); + summaryPreference.setLimitInfo(TextUtils.expandTemplate( + mContext.getText(R.string.cell_data_warning), + DataUsageUtils.formatDataUsage(mContext, info.warningLevel))); } else if (info.limitLevel > 0) { summaryPreference.setLimitInfo(TextUtils.expandTemplate( mContext.getText(R.string.cell_data_limit), - Formatter.formatFileSize(mContext, info.limitLevel))); + DataUsageUtils.formatDataUsage(mContext, info.limitLevel))); } else { summaryPreference.setLimitInfo(null); } @@ -243,20 +239,13 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll } else { summaryPreference.setChartEnabled(true); summaryPreference.setLabels(Formatter.formatFileSize(mContext, 0 /* sizeBytes */), - Formatter.formatFileSize(mContext, mDataBarSize)); + DataUsageUtils.formatDataUsage(mContext, mDataBarSize)); summaryPreference.setProgress(mDataplanUse / (float) mDataBarSize); } summaryPreference.setUsageInfo(mCycleEnd, mSnapshotTime, mCarrierName, mDataplanCount, mManageSubscriptionIntent); } - private String getLimitText(long limit, int textId) { - if (limit <= 0) { - return null; - } - return mContext.getString(textId, Formatter.formatFileSize(mContext, limit)); - } - // TODO(b/70950124) add test for this method once the robolectric shadow run script is // completed (b/3526807) private void refreshDataplanInfo(DataUsageController.DataUsageInfo info) { @@ -318,27 +307,4 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll public static boolean unlimited(long size) { return size == SubscriptionPlan.BYTES_UNLIMITED; } - - @VisibleForTesting - private static CharSequence formatUsage(Context context, String template, long usageLevel) { - final int FLAGS = Spannable.SPAN_INCLUSIVE_INCLUSIVE; - - final Formatter.BytesResult usedResult = Formatter.formatBytes(context.getResources(), - usageLevel, Formatter.FLAG_CALCULATE_ROUNDED); - final SpannableString enlargedValue = new SpannableString(usedResult.value); - enlargedValue.setSpan( - new RelativeSizeSpan(RELATIVE_SIZE_LARGE), 0, enlargedValue.length(), FLAGS); - - final SpannableString amountTemplate = new SpannableString( - context.getString(com.android.internal.R.string.fileSizeSuffix) - .replace("%1$s", "^1").replace("%2$s", "^2")); - final CharSequence formattedUsage = TextUtils.expandTemplate(amountTemplate, - enlargedValue, usedResult.units); - - final SpannableString fullTemplate = new SpannableString(template); - fullTemplate.setSpan( - new RelativeSizeSpan(RELATIVE_SIZE_SMALL), 0, fullTemplate.length(), FLAGS); - return TextUtils.expandTemplate(fullTemplate, - BidiFormatter.getInstance().unicodeWrap(formattedUsage.toString())); - } } diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java index 9c830470a77..803bc37589b 100644 --- a/src/com/android/settings/datausage/DataUsageUtils.java +++ b/src/com/android/settings/datausage/DataUsageUtils.java @@ -14,7 +14,6 @@ package com.android.settings.datausage; -import static android.net.ConnectivityManager.TYPE_ETHERNET; import static android.net.ConnectivityManager.TYPE_WIFI; import android.content.Context; @@ -29,6 +28,10 @@ import android.os.SystemProperties; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import android.text.BidiFormatter; +import android.text.format.Formatter; +import android.text.format.Formatter.BytesResult; + import java.util.List; /** @@ -42,6 +45,16 @@ public final class DataUsageUtils { private DataUsageUtils() { } + /** + * Format byte value to readable string using IEC units. + */ + public static CharSequence formatDataUsage(Context context, long byteValue) { + final BytesResult res = Formatter.formatBytes(context.getResources(), byteValue, + Formatter.FLAG_IEC_UNITS); + return BidiFormatter.getInstance().unicodeWrap(context.getString( + com.android.internal.R.string.fileSizeSuffix, res.value, res.units)); + } + /** * Test if device has an ethernet network connection. */ diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index 555f35da689..710736da1fe 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -110,6 +110,7 @@ public class BillingCycleSettingsTest { @Test public void testDataUsageSummary_shouldBeNullWithV2() { final BillingCycleSettings billingCycleSettings = spy(new BillingCycleSettings()); + when(billingCycleSettings.getContext()).thenReturn(mContext); billingCycleSettings.setUpForTest(mNetworkPolicyEditor, mBillingCycle, mDataLimit, mDataWarning, mEnableDataLimit, mEnableDataWarning); diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java index c129f174023..b0349e65ad1 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java @@ -31,13 +31,13 @@ import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; import android.net.NetworkTemplate; +import android.support.v7.widget.RecyclerView; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.applications.AppInfoWithHeaderTest; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; @@ -60,8 +60,6 @@ import org.mockito.ArgumentCaptor; import java.util.concurrent.TimeUnit; -import android.support.v7.widget.RecyclerView; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class DataUsageSummaryPreferenceControllerTest { @@ -69,8 +67,8 @@ public class DataUsageSummaryPreferenceControllerTest { private static final long UPDATE_BACKOFF_MS = TimeUnit.MINUTES.toMillis(13); private static final long CYCLE_BACKOFF_MS = TimeUnit.DAYS.toMillis(6); private static final long CYCLE_LENGTH_MS = TimeUnit.DAYS.toMillis(30); - private static final long USAGE1 = 373000000L; - private static final long LIMIT1 = 1000000000L; + private static final long USAGE1 = 373 * BillingCycleSettings.MIB_IN_BYTES; + private static final long LIMIT1 = BillingCycleSettings.GIB_IN_BYTES; private static final String CARRIER_NAME = "z-mobile"; private static final String PERIOD = "Feb"; @@ -154,7 +152,7 @@ public class DataUsageSummaryPreferenceControllerTest { ArgumentCaptor captor = ArgumentCaptor.forClass(CharSequence.class); verify(mSummaryPreference).setLimitInfo(captor.capture()); CharSequence value = captor.getValue(); - assertThat(value.toString()).isEqualTo("500 MB data warning / 1.00 GB data limit"); + assertThat(value.toString()).isEqualTo("512 MB data warning / 1.00 GB data limit"); verify(mSummaryPreference).setUsageInfo(info.cycleEnd, now - UPDATE_BACKOFF_MS, CARRIER_NAME, 1 /* numPlans */, intent); @@ -178,7 +176,7 @@ public class DataUsageSummaryPreferenceControllerTest { ArgumentCaptor captor = ArgumentCaptor.forClass(CharSequence.class); verify(mSummaryPreference).setLimitInfo(captor.capture()); CharSequence value = captor.getValue(); - assertThat(value.toString()).isEqualTo("500 MB data warning / 1.00 GB data limit"); + assertThat(value.toString()).isEqualTo("512 MB data warning / 1.00 GB data limit"); verify(mSummaryPreference).setUsageInfo(info.cycleEnd, now - UPDATE_BACKOFF_MS, CARRIER_NAME, 0 /* numPlans */, intent); @@ -200,7 +198,7 @@ public class DataUsageSummaryPreferenceControllerTest { ArgumentCaptor captor = ArgumentCaptor.forClass(CharSequence.class); verify(mSummaryPreference).setLimitInfo(captor.capture()); CharSequence value = captor.getValue(); - assertThat(value.toString()).isEqualTo("500 MB data warning / 1.00 GB data limit"); + assertThat(value.toString()).isEqualTo("512 MB data warning / 1.00 GB data limit"); verify(mSummaryPreference).setUsageInfo( info.cycleEnd, @@ -227,8 +225,7 @@ public class DataUsageSummaryPreferenceControllerTest { ArgumentCaptor captor = ArgumentCaptor.forClass(CharSequence.class); verify(mSummaryPreference).setLimitInfo(captor.capture()); CharSequence value = captor.getValue(); - assertThat(value.toString()).isEqualTo("500 MB data warning / 1.00 GB data limit"); - + assertThat(value.toString()).isEqualTo("512 MB data warning / 1.00 GB data limit"); verify(mSummaryPreference).setUsageInfo( info.cycleEnd, -1L /* snapshotTime */, @@ -260,7 +257,7 @@ public class DataUsageSummaryPreferenceControllerTest { public void testSummaryUpdate_warningOnly() { final long now = System.currentTimeMillis(); final DataUsageController.DataUsageInfo info = createTestDataUsageInfo(now); - info.warningLevel = 1000000L; + info.warningLevel = BillingCycleSettings.MIB_IN_BYTES; info.limitLevel = 0L; final Intent intent = new Intent(); @@ -282,7 +279,7 @@ public class DataUsageSummaryPreferenceControllerTest { final long now = System.currentTimeMillis(); final DataUsageController.DataUsageInfo info = createTestDataUsageInfo(now); info.warningLevel = 0L; - info.limitLevel = 1000000L; + info.limitLevel = BillingCycleSettings.MIB_IN_BYTES; final Intent intent = new Intent(); @@ -302,8 +299,8 @@ public class DataUsageSummaryPreferenceControllerTest { public void testSummaryUpdate_limitAndWarning() { final long now = System.currentTimeMillis(); final DataUsageController.DataUsageInfo info = createTestDataUsageInfo(now); - info.warningLevel = 1000000L; - info.limitLevel = 1000000L; + info.warningLevel = BillingCycleSettings.MIB_IN_BYTES; + info.limitLevel = BillingCycleSettings.MIB_IN_BYTES; final Intent intent = new Intent(); @@ -324,8 +321,8 @@ public class DataUsageSummaryPreferenceControllerTest { public void testSummaryUpdate_noSim_shouldSetWifiMode() { final long now = System.currentTimeMillis(); final DataUsageController.DataUsageInfo info = createTestDataUsageInfo(now); - info.warningLevel = 1000000L; - info.limitLevel = 1000000L; + info.warningLevel = BillingCycleSettings.MIB_IN_BYTES; + info.limitLevel = BillingCycleSettings.MIB_IN_BYTES; final Intent intent = new Intent(); diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index 843b76ecacb..d40afea4dea 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -17,8 +17,6 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.verify; import android.app.Activity; import android.content.ComponentName; @@ -41,17 +39,15 @@ import com.android.settings.SubSettings; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settingslib.Utils; -import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.Shadows; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; import java.util.concurrent.TimeUnit; @@ -216,7 +212,7 @@ public class DataUsageSummaryPreferenceTest { } @Test - public void testSetUsageInfo_withRecentCarrierUpdate_doesNotSetCarrierInfoWarningColorAndFont() { + public void setUsageInfo_withRecentCarrierUpdate_doesNotSetCarrierInfoWarningColorAndFont() { final long updateTime = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(1); mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update); mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */, @@ -373,7 +369,10 @@ public class DataUsageSummaryPreferenceTest { public void testSetUsageAndRemainingInfo_withUsageInfo_dataUsageAndRemainingShown() { mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */, new Intent()); - mSummaryPreference.setUsageNumbers(1000000L, 10000000L, true); + mSummaryPreference.setUsageNumbers( + BillingCycleSettings.MIB_IN_BYTES, + 10 * BillingCycleSettings.MIB_IN_BYTES, + true /* hasMobileData */); bindViewHolder(); assertThat(mDataUsed.getText().toString()).isEqualTo("1.00 MB used"); @@ -386,7 +385,10 @@ public class DataUsageSummaryPreferenceTest { public void testSetUsageInfo_withDataOverusage() { mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */, new Intent()); - mSummaryPreference.setUsageNumbers(11_000_000L, 10_000_000L, true); + mSummaryPreference.setUsageNumbers( + 11 * BillingCycleSettings.MIB_IN_BYTES, + 10 * BillingCycleSettings.MIB_IN_BYTES, + true /* hasMobileData */); bindViewHolder(); assertThat(mDataUsed.getText().toString()).isEqualTo("11.00 MB used"); @@ -399,7 +401,8 @@ public class DataUsageSummaryPreferenceTest { public void testSetUsageInfo_withUsageInfo_dataUsageShown() { mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */, new Intent()); - mSummaryPreference.setUsageNumbers(1000000L, -1L, true); + mSummaryPreference.setUsageNumbers( + BillingCycleSettings.MIB_IN_BYTES, -1L, true /* hasMobileData */); bindViewHolder(); assertThat(mDataUsed.getText().toString()).isEqualTo("1.00 MB used"); diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java index a6ddec133e5..6f0ec9f55c1 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java @@ -16,11 +16,20 @@ package com.android.settings.datausage; +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.anyString; +import static org.mockito.Matchers.endsWith; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + import android.app.Activity; import android.content.Context; import android.net.NetworkPolicyManager; -import android.os.Bundle; -import android.text.format.Formatter; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,17 +48,6 @@ import org.robolectric.Robolectric; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.endsWith; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - @Config(shadows = { SettingsShadowResourcesImpl.class, SettingsShadowResources.SettingsShadowTheme.class, @@ -93,8 +91,8 @@ public class DataUsageSummaryTest { final long usage = 2147483648L; // 2GB final String formattedUsage = DataUsageSummary.formatUsage(mContext, "^1", usage).toString(); - final String formattedAsFileSize = Formatter.formatFileSize(mContext, usage); - assertThat(formattedUsage).isEqualTo(formattedAsFileSize); + final CharSequence formattedInIECUnit = DataUsageUtils.formatDataUsage(mContext, usage); + assertThat(formattedUsage).isEqualTo(formattedInIECUnit); } @Test diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java index d59a4a864fd..a35c897df05 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.net.ConnectivityManager; import android.telephony.TelephonyManager; +import android.util.DataUnit; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -78,4 +79,12 @@ public final class DataUsageUtilsTest { boolean hasSim = DataUsageUtils.hasSim(mContext); assertThat(hasSim).isFalse(); } + + @Test + public void formatDataUsage_useIECUnit() { + final CharSequence formattedDataUsage = DataUsageUtils.formatDataUsage( + mContext, DataUnit.GIBIBYTES.toBytes(1)); + + assertThat(formattedDataUsage).isEqualTo("1.00 GB"); + } }