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

Merge "Fix dialog disappear when screen off and on"

Browse Source
This commit is contained in:
Allen Su
2023-05-18 13:17:46 +00:00
committed by Android (Google) Code Review
parent 93525c07f1 998933a44d
commit bcfb1e22f6
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/localepicker/LocaleListEditor.java
View File

@@ -149,14 +149,6 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View
}
}
@Override
public void onStop() {
super.onStop();
if (mSuggestionDialog != null) {
mSuggestionDialog.dismiss();
}
}
@Override
public void onViewStateRestored(Bundle savedInstanceState) {
super.onViewStateRestored(savedInstanceState);
@@ -246,6 +238,14 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View
super.onActivityResult(requestCode, resultCode, data);
}
@Override
public void onDestroy() {
super.onDestroy();
if (mSuggestionDialog != null) {
mSuggestionDialog.dismiss();
}
}
@VisibleForTesting
static LocaleStore.LocaleInfo mayAppendUnicodeTags(
LocaleStore.LocaleInfo localeInfo, String recordTags) {
@@ -290,8 +290,8 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View
private boolean isAllowedPackage() {
List<String> allowList = Arrays.asList(getContext().getResources().getStringArray(
R.array.allowed_packages_for_locale_confirmation_diallog));
String callingPckage = getActivity().getCallingPackage();
return !isNullOrEmpty(callingPckage) && allowList.contains(callingPckage);
String callingPackage = getActivity().getCallingPackage();
return !isNullOrEmpty(callingPackage) && allowList.contains(callingPackage);
}
private static boolean isNullOrEmpty(String str) {