Merge "Fix cell data limit dialog title" into nyc-dev am: 2a6bc40d49 am: 6f71ed9dbb

am: ce1fa74716

* commit 'ce1fa7471648daac5abe5d3d322de3798ab8aea9':
  Fix cell data limit dialog title

Change-Id: I4f337ad301b16edc173ff903d5105075b36782a2
This commit is contained in:
Jason Monk
2016-05-05 16:01:50 +00:00
committed by android-build-merger

View File

@@ -173,11 +173,13 @@ public class BillingCycleSettings extends DataUsageBase implements
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();