| commit | fc0033fa2e7912a8a69a041e7ab728a895dd7d14 | [log] [tgz] |
|---|---|---|
| author | Josh Hou <joshhou@google.com> | Fri Apr 08 11:32:21 2022 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 08 11:32:21 2022 +0000 |
| tree | 19ea4ad32f5fdefda320247b52bd79504c7c47c2 | |
| parent | c77a56af57c99c52136bfd77fa7d834d1f9a8262 [diff] | |
| parent | 98490cc740193bdf022fafa39e6e0bd8b987d409 [diff] |
Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev
diff --git a/src/com/android/settings/localepicker/AppLocalePickerActivity.java b/src/com/android/settings/localepicker/AppLocalePickerActivity.java index 9a8aed2..4f23ae8 100644 --- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java +++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
@@ -73,6 +73,7 @@ UserHandle userHandle = UserHandle.getUserHandleForUid(uid); mContextAsUser = createContextAsUser(userHandle, 0); + setTitle(R.string.app_locale_picker_title); getActionBar().setDisplayHomeAsUpEnabled(true); mLocalePickerWithRegion = LocalePickerWithRegion.createLanguagePicker(
diff --git a/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java b/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java index bcc55e3..a8c93c1 100644 --- a/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java +++ b/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
@@ -36,6 +36,7 @@ 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 */);