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

Commit e3281e01 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: fc0033fa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17631064



Change-Id: I0676a2cd4a37e2c7234bf8428e8c0f6a642d560b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac4f2642 fc0033fa

src/com/android/settings/localepicker/AppLocalePickerActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity 
        UserHandle userHandle = UserHandle.getUserHandleForUid(uid);

        mContextAsUser = createContextAsUser(userHandle, 0);



        setTitle(R.string.app_locale_picker_title);

        getActionBar().setDisplayHomeAsUpEnabled(true);



        mLocalePickerWithRegion = LocalePickerWithRegion.createLanguagePicker(

src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ public class LocalePickerWithRegionActivity extends SettingsBaseActivity 
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        getActionBar().setDisplayHomeAsUpEnabled(true);

        setTitle(R.string.add_a_language);



        final LocalePickerWithRegion selector = LocalePickerWithRegion.createLanguagePicker(

                this, LocalePickerWithRegionActivity.this, false /* translate only */);