[automerge] [Panlingual] Screen title is displayed incorrectly 2p: db37825c6f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17630328

Bug: 227285277
Change-Id: I82c944a9e827d56612bab48c612a043076a98528
This commit is contained in:
Presubmit Automerger Backend
2022-04-08 01:53:46 +00:00

View File

@@ -63,6 +63,7 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O
private int mFirstVisiblePosition = 0;
private int mTopDistance = 0;
private String mAppPackageName;
private CharSequence mTitle = null;
/**
* Other classes can register to be notified when a locale was selected.
@@ -213,6 +214,7 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O
return;
}
mTitle = getActivity().getTitle();
final boolean countryMode = mParentLocale != null;
final Locale sortingLocale = countryMode ? mParentLocale.getLocale() : Locale.getDefault();
mAdapter = new SuggestedLocaleAdapter(mLocaleList, countryMode, mAppPackageName);
@@ -248,7 +250,7 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O
if (mParentLocale != null) {
getActivity().setTitle(mParentLocale.getFullNameNative());
} else {
getActivity().setTitle(R.string.language_selection_title);
getActivity().setTitle(mTitle);
}
getListView().requestFocus();