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

Merge "[Regional Preference] Do not get child fragment if the fragment is not added" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-24 15:54:35 +00:00
committed by Android (Google) Code Review
parent 5ae083b952 cec01e38ef
commit d6fb2c45dc
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,20 +51,27 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment {
static final String ARG_TARGET_LOCALE = "arg_target_locale";
static final String ARG_RESULT_RECEIVER = "arg_result_receiver";
public static LocaleDialogFragment newInstance() {
return new LocaleDialogFragment();
}
/**
* Show dialog
*/
public static void show(
public void show(
@NonNull RestrictedSettingsFragment fragment,
int dialogType,
LocaleStore.LocaleInfo localeInfo) {
if (!isAdded()) {
return;
}
show(fragment, dialogType, localeInfo, null);
}
/**
* Show dialog
*/
public static void show(
public void show(
@NonNull RestrictedSettingsFragment fragment,
int dialogType,
LocaleStore.LocaleInfo localeInfo,

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

@@ -319,8 +319,9 @@ class LocaleDragAndDropAdapter
public void doTheUpdateWithMovingLocaleItem() {
LocaleStore.LocaleInfo localeInfo = mFeedItemList.get(0);
final LocaleDialogFragment fragment = LocaleDialogFragment.newInstance();
if (!localeInfo.getLocale().equals(LocalePicker.getLocales().get(0))) {
LocaleDialogFragment.show(mParent,
fragment.show(mParent,
LocaleDialogFragment.DIALOG_CONFIRM_SYSTEM_DEFAULT,
localeInfo,
new ResultReceiver(new Handler(Looper.getMainLooper())) {
@@ -332,7 +333,7 @@ class LocaleDragAndDropAdapter
if (resultCode == Activity.RESULT_OK) {
doTheUpdate();
if (!localeInfo.isTranslated()) {
LocaleDialogFragment.show(mParent,
fragment.show(mParent,
LocaleDialogFragment
.DIALOG_NOT_AVAILABLE_LOCALE,
localeInfo);