PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Don't use framework strings for formatting file sizes"

Browse Source 
The previous revert ag/3403198/ is incomplete.

I just learned that "git revert" has memory.
"git revert" re-applied my previous incorrect merge conflict resolution
when I reverted the same change again.

Test: adb shell am instrument -w -e class
com.android.settings.utils.FileSizeFormatterTest
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Test: make -j RunSettingsRoboTests
Test: manual. GB is shown in Settings > Network > data usage > tap at top
Bug: 70050030
Bug: 70005649
Bug: 36994779
Change-Id: Ia56f8aaf9b5048c102b4e480da0e84e90ee51360
This commit is contained in:
Victor Chang
2018-01-05 11:58:46 +00:00
parent 75325675de
commit 03358c0cdf
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/datausage/BillingCycleSettings.java
View File

@@ -24,8 +24,6 @@ import android.app.Fragment;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.res.Resources; import android.content.res.Resources;
import android.icu.text.MeasureFormat;
import android.icu.util.MeasureUnit;
import android.net.NetworkPolicy; import android.net.NetworkPolicy;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.os.Bundle; import android.os.Bundle;
@@ -36,7 +34,6 @@ import android.text.format.Time;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.EditText; import android.widget.EditText;
import android.widget.NumberPicker; import android.widget.NumberPicker;
import android.widget.Spinner; import android.widget.Spinner;
@@ -256,17 +253,6 @@ public class BillingCycleSettings extends DataUsageBase implements
: editor.getPolicyWarningBytes(template); : editor.getPolicyWarningBytes(template);
final long limitDisabled = isLimit ? LIMIT_DISABLED : WARNING_DISABLED; final long limitDisabled = isLimit ? LIMIT_DISABLED : WARNING_DISABLED;
final MeasureFormat formatter = MeasureFormat.getInstance(
getContext().getResources().getConfiguration().locale,
MeasureFormat.FormatWidth.SHORT);
final String[] unitNames = new String[] {
formatter.getUnitDisplayName(MeasureUnit.MEGABYTE),
formatter.getUnitDisplayName(MeasureUnit.GIGABYTE)
};
final ArrayAdapter<String> adapter = new ArrayAdapter<String>(
getContext(), R.layout.data_usage_spinner_item, unitNames);
type.setAdapter(adapter);
if (bytes > 1.5f * GB_IN_BYTES) { if (bytes > 1.5f * GB_IN_BYTES) {
final String bytesText = formatText(bytes / (float) GB_IN_BYTES); final String bytesText = formatText(bytes / (float) GB_IN_BYTES);
bytesPicker.setText(bytesText); bytesPicker.setText(bytesText);