commit 2a6bc40d497d1bc0fdfc9cc86bc4db72791909b7
author Jason Monk <jmonk@google.com> Thu May 05 15:40:50 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 05 15:40:51 2016 +0000
tree d2f3ecdd67f0302519c83d99de0871240d33ca70
parent de4b51c8ce4d16ef086ad04532113a942b267f1a
parent a058ae0ddad825b0b3c83f2839265ad003291724

Merge "Fix cell data limit dialog title" into nyc-dev

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

diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index be05af7..a17c8fc 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -173,11 +173,13 @@
 
 
             final LayoutInflater dialogInflater = LayoutInflater.from(context);
+            final boolean isLimit = getArguments().getBoolean(EXTRA_LIMIT);
             mView = dialogInflater.inflate(R.layout.data_usage_bytes_editor, null, false);
             setupPicker((EditText) mView.findViewById(R.id.bytes),
                     (Spinner) mView.findViewById(R.id.size_spinner));
             return new AlertDialog.Builder(context)
-                    .setTitle(R.string.data_usage_warning_editor_title)
+                    .setTitle(isLimit ? R.string.data_usage_limit_editor_title
+                            : R.string.data_usage_warning_editor_title)
                     .setView(mView)
                     .setPositiveButton(R.string.data_usage_cycle_editor_positive, this)
                     .create();