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

Load default data warning value instead of hardcode it. am: 688ad857e8

Browse Source 
am: 2ef1750fff

Change-Id: I1b33b9e40e0daf6b489a0662f7b14631b6899d7b
This commit is contained in:
Fan Zhang
2016-08-17 18:31:20 +00:00
committed by android-build-merger
parent 617f47d77a 2ef1750fff
commit ddb3407dd5
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

@@ -92,8 +92,10 @@ public class BillingCycleSettings extends DataUsageBase implements
NetworkPolicy policy = services.mPolicyEditor.getPolicy(mNetworkTemplate); NetworkPolicy policy = services.mPolicyEditor.getPolicy(mNetworkTemplate);
mBillingCycle.setSummary(getString(R.string.billing_cycle_summary, policy != null ? mBillingCycle.setSummary(getString(R.string.billing_cycle_summary, policy != null ?
policy.cycleDay : 1)); policy.cycleDay : 1));
mDataWarning.setSummary(Formatter.formatFileSize(getContext(), policy != null mDataWarning.setSummary(Formatter.formatFileSize(getContext(),
? policy.warningBytes : DataUsageController.DEFAULT_WARNING_LEVEL)); policy != null
? policy.warningBytes
: mDataUsageController.getDefaultWarningLevel()));
if (policy != null && policy.limitBytes != LIMIT_DISABLED) { if (policy != null && policy.limitBytes != LIMIT_DISABLED) {
mDataLimit.setSummary(Formatter.formatFileSize(getContext(), policy.limitBytes)); mDataLimit.setSummary(Formatter.formatFileSize(getContext(), policy.limitBytes));
mDataLimit.setEnabled(true); mDataLimit.setEnabled(true);