From c117a89a534fa406414496d659ca5ea37628967f Mon Sep 17 00:00:00 2001 From: Calvin Pan Date: Wed, 23 Mar 2022 04:43:00 +0000 Subject: [PATCH] Fix System language option missing and locale region missing issue - Taking app package name into LocalePickerWithRegion - Using toLanguageTag() instead of getLanguage() to prevent locale region missing Bug: 226278910 Bug: 226280740 Change-Id: Ieac42616192065abc0cf82db023e4e50f1ca562d Test: To be verified --- .../settings/localepicker/AppLocalePickerActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/localepicker/AppLocalePickerActivity.java b/src/com/android/settings/localepicker/AppLocalePickerActivity.java index 227b5e35bae..8c00d08c19a 100644 --- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java +++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java @@ -62,7 +62,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity // Create Locale picker part. final LocalePickerWithRegion selector = LocalePickerWithRegion.createLanguagePicker( - this, AppLocalePickerActivity.this, false /* translate only */); + this, AppLocalePickerActivity.this, false /* translate only */, mPackageName); // LocalePickerWithRegion use android.app.ListFragment. Thus, it can not user // getSupportFragmentManager() to add this into container. getFragmentManager() @@ -101,7 +101,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity if (localeInfo == null || localeInfo.getLocale() == null) { setAppDefaultLocale(""); } else { - setAppDefaultLocale(localeInfo.getLocale().getLanguage()); + setAppDefaultLocale(localeInfo.getLocale().toLanguageTag()); } finish(); }