Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev

Browse Source
This commit is contained in:
Josh Hou
2022-04-08 11:32:21 +00:00
committed by Android (Google) Code Review
parent 417df3f1e9 db37825c6f
commit 16b3ddf421
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/app/LocalePickerWithRegion.java
View File

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