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

Improve dialog and system dialog UI

Browse Source 
- Fix wrong subtitle on system language list.
 - Do not dismiss dialog if user touch outside of dialog.

Bug: b/276417170
Test: Manual test.

Change-Id: Ib049dc3d89e6afc7d39171ac686616cc64dae3ba
This commit is contained in:
tom hsu
2023-03-31 18:10:48 +08:00
parent e78b3d3f7e
commit 7a9202587e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/localepicker/LocaleDialogFragment.java
View File

@@ -101,6 +101,7 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment {
R.layout.locale_dialog, null); R.layout.locale_dialog, null);
setDialogTitle(viewGroup, dialogContent.mTitle); setDialogTitle(viewGroup, dialogContent.mTitle);
setDialogMessage(viewGroup, dialogContent.mMessage); setDialogMessage(viewGroup, dialogContent.mMessage);
AlertDialog.Builder builder = new AlertDialog.Builder(getContext()) AlertDialog.Builder builder = new AlertDialog.Builder(getContext())
.setView(viewGroup); .setView(viewGroup);
if (!dialogContent.mPositiveButton.isEmpty()) { if (!dialogContent.mPositiveButton.isEmpty()) {
@@ -109,7 +110,9 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment {
if (!dialogContent.mNegativeButton.isEmpty()) { if (!dialogContent.mNegativeButton.isEmpty()) {
builder.setNegativeButton(dialogContent.mNegativeButton, controller); builder.setNegativeButton(dialogContent.mNegativeButton, controller);
} }
return builder.create(); AlertDialog alertDialog = builder.create();
alertDialog.setCanceledOnTouchOutside(false);
return alertDialog;
} }
private static void setDialogTitle(View root, String content) { private static void setDialogTitle(View root, String content) {

2
src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
View File

@@ -165,7 +165,7 @@ class LocaleDragAndDropAdapter
dragCell.setLabelAndDescription(label, description); dragCell.setLabelAndDescription(label, description);
dragCell.setLocalized(feedItem.isTranslated()); dragCell.setLocalized(feedItem.isTranslated());
dragCell.setCurrentDefault(feedItem.getLocale().equals(LocalePicker.getLocales().get(0))); dragCell.setCurrentDefault(feedItem.getLocale().equals(Locale.getDefault()));
dragCell.setMiniLabel(mNumberFormatter.format(i + 1)); dragCell.setMiniLabel(mNumberFormatter.format(i + 1));
dragCell.setShowCheckbox(mRemoveMode); dragCell.setShowCheckbox(mRemoveMode);
dragCell.setShowMiniLabel(!mRemoveMode); dragCell.setShowMiniLabel(!mRemoveMode);