Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0c7038e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Switch from SI to IEC unit when formatting data usage bytes" into pi-dev

parents c22bada8 be301903

src/com/android/settings/datausage/AppDataUsage.java

+3 −4
Original line number Diff line number Diff line
@@ -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() {

src/com/android/settings/datausage/AppDataUsagePreference.java

+1 −2
Original line number Diff line number Diff line
@@ -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) {

src/com/android/settings/datausage/BillingCycleSettings.java

+10 −12
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/datausage/ChartDataUsagePreference.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/datausage/DataUsageList.java

+1 −2
Original line number Diff line number Diff line
@@ -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));

    }