OSDN Git Service

Load default data warning value instead of hardcode it.
authorFan Zhang <zhfan@google.com>
Tue, 9 Aug 2016 23:27:54 +0000 (16:27 -0700)
committerFan Zhang <zhfan@google.com>
Tue, 16 Aug 2016 21:14:21 +0000 (14:14 -0700)
Bug: 30898071
Change-Id: I36f3669ca07862476c778aabb1290f3ceb3afc92

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

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