From db37825c6facc3e6bea4dbfcff6dcce744847cdc Mon Sep 17 00:00:00 2001 From: Josh Hou Date: Thu, 7 Apr 2022 13:11:30 +0800 Subject: [Panlingual] Screen title is displayed incorrectly Fix the issue that the screen title name of the app language page is displayed incorrectly Bug: 227285277 Test: Verify the issue by testing between the system language and app language page Change-Id: I229b9ff2defb68d70248a95886d8600e1bc464ea --- core/java/com/android/internal/app/LocalePickerWithRegion.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/app/LocalePickerWithRegion.java b/core/java/com/android/internal/app/LocalePickerWithRegion.java index 52c74cf81508..ac1d2c724e89 100644 --- a/core/java/com/android/internal/app/LocalePickerWithRegion.java +++ b/core/java/com/android/internal/app/LocalePickerWithRegion.java @@ -61,6 +61,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. @@ -202,6 +203,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); @@ -237,7 +239,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(); -- cgit v1.2.3-59-g8ed1b