PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I324d90f3fac5b80c9e591384f5cc97044c03b9df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Josh Hou
2022-04-08 12:45:34 +00:00
committed by Automerger Merge Worker
parent 5c6699ca7a e3281e01b7
commit 72ded649e3
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/localepicker/AppLocalePickerActivity.java
View File

@@ -73,6 +73,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
UserHandle userHandle = UserHandle.getUserHandleForUid(uid); UserHandle userHandle = UserHandle.getUserHandleForUid(uid);
mContextAsUser = createContextAsUser(userHandle, 0); mContextAsUser = createContextAsUser(userHandle, 0);
setTitle(R.string.app_locale_picker_title);
getActionBar().setDisplayHomeAsUpEnabled(true); getActionBar().setDisplayHomeAsUpEnabled(true);
mLocalePickerWithRegion = LocalePickerWithRegion.createLanguagePicker( mLocalePickerWithRegion = LocalePickerWithRegion.createLanguagePicker(

1
src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
View File

@@ -36,6 +36,7 @@ public class LocalePickerWithRegionActivity extends SettingsBaseActivity
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getActionBar().setDisplayHomeAsUpEnabled(true); getActionBar().setDisplayHomeAsUpEnabled(true);
setTitle(R.string.add_a_language);
final LocalePickerWithRegion selector = LocalePickerWithRegion.createLanguagePicker( final LocalePickerWithRegion selector = LocalePickerWithRegion.createLanguagePicker(
this, LocalePickerWithRegionActivity.this, false /* translate only */); this, LocalePickerWithRegionActivity.this, false /* translate only */);