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

Merge "[Settings] Avoid from dialog disappear when click outside" into sc-v2-dev am: fd6ddcd050

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16278918

Change-Id: I80c2ae9f28c8b34579dd883f1976116ac47c47de
This commit is contained in:
Bonian Chen
2021-11-17 05:55:21 +00:00
committed by Automerger Merge Worker
parent df8cc34945 fd6ddcd050
commit a77928c6f4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -271,12 +271,14 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements
mView = dialogInflater.inflate(R.layout.data_usage_bytes_editor, null, false); mView = dialogInflater.inflate(R.layout.data_usage_bytes_editor, null, false);
setupPicker((EditText) mView.findViewById(R.id.bytes), setupPicker((EditText) mView.findViewById(R.id.bytes),
(Spinner) mView.findViewById(R.id.size_spinner)); (Spinner) mView.findViewById(R.id.size_spinner));
return new AlertDialog.Builder(context) Dialog dialog = new AlertDialog.Builder(context)
.setTitle(isLimit ? R.string.data_usage_limit_editor_title .setTitle(isLimit ? R.string.data_usage_limit_editor_title
: R.string.data_usage_warning_editor_title) : R.string.data_usage_warning_editor_title)
.setView(mView) .setView(mView)
.setPositiveButton(R.string.data_usage_cycle_editor_positive, this) .setPositiveButton(R.string.data_usage_cycle_editor_positive, this)
.create(); .create();
dialog.setCanceledOnTouchOutside(false);
return dialog;
} }
private void setupPicker(EditText bytesPicker, Spinner type) { private void setupPicker(EditText bytesPicker, Spinner type) {
@@ -402,10 +404,12 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements
mCycleDayPicker.setValue(cycleDay); mCycleDayPicker.setValue(cycleDay);
mCycleDayPicker.setWrapSelectorWheel(true); mCycleDayPicker.setWrapSelectorWheel(true);
return builder.setTitle(R.string.data_usage_cycle_editor_title) Dialog dialog = builder.setTitle(R.string.data_usage_cycle_editor_title)
.setView(view) .setView(view)
.setPositiveButton(R.string.data_usage_cycle_editor_positive, this) .setPositiveButton(R.string.data_usage_cycle_editor_positive, this)
.create(); .create();
dialog.setCanceledOnTouchOutside(false);
return dialog;
} }
@Override @Override
@@ -466,12 +470,14 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
final Context context = getActivity(); final Context context = getActivity();
return new AlertDialog.Builder(context) Dialog dialog = new AlertDialog.Builder(context)
.setTitle(R.string.data_usage_limit_dialog_title) .setTitle(R.string.data_usage_limit_dialog_title)
.setMessage(R.string.data_usage_limit_dialog_mobile) .setMessage(R.string.data_usage_limit_dialog_mobile)
.setPositiveButton(android.R.string.ok, this) .setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.create(); .create();
dialog.setCanceledOnTouchOutside(false);
return dialog;
} }
@Override @Override