Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f610a7c0 authored by Josh Hou's avatar Josh Hou Committed by Automerger Merge Worker
Browse files

Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev am: 16b3ddf4 

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



Change-Id: I28785eed20d8d4839de7c5669d964be559ac1a4d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ccae8bdd 16b3ddf4

core/java/com/android/internal/app/LocalePickerWithRegion.java

+3 −1
Original line number Diff line number Diff line
@@ -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();