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

Use consistent formatter to convert byte->MB->GB.

Browse Source 
In data usage screen, displaying and setting data warning/limit should
use the same value to convert units.

Change-Id: Ic237203dbaf23cb0c99165d0055f259a30fd8cf9
Fix: 34204773
Test: RunSettingsRoboTests
This commit is contained in:
Fan Zhang
2017-01-24 11:29:27 -08:00
parent 03cd212f17
commit 762c9f2488
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,14 +44,16 @@ import com.android.settingslib.net.DataUsageController;
import static android.net.NetworkPolicy.LIMIT_DISABLED; import static android.net.NetworkPolicy.LIMIT_DISABLED;
import static android.net.NetworkPolicy.WARNING_DISABLED; import static android.net.NetworkPolicy.WARNING_DISABLED;
import static android.net.TrafficStats.GB_IN_BYTES;
import static android.net.TrafficStats.MB_IN_BYTES;
public class BillingCycleSettings extends DataUsageBase implements public class BillingCycleSettings extends DataUsageBase implements
Preference.OnPreferenceChangeListener, DataUsageEditController { Preference.OnPreferenceChangeListener, DataUsageEditController {
private static final String TAG = "BillingCycleSettings"; private static final String TAG = "BillingCycleSettings";
private static final boolean LOGD = false; 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;
private static final long MAX_DATA_LIMIT_BYTES = 50000 * GB_IN_BYTES; private static final long MAX_DATA_LIMIT_BYTES = 50000 * GB_IN_BYTES;
private static final String TAG_CONFIRM_LIMIT = "confirmLimit"; private static final String TAG_CONFIRM_LIMIT = "confirmLimit";