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

Merge "[ToA] Should strip u extension when check locale" into main

Browse Source
This commit is contained in:
Zoey Chen
2024-03-26 06:31:09 +00:00
committed by Android (Google) Code Review
parent 4e5acef79d 51d6aeb5c2
commit 4fe6c0e4ce
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/localepicker/TermsOfAddressCategoryController.java
View File

@@ -36,9 +36,10 @@ import java.util.Locale;
public class TermsOfAddressCategoryController extends PreferenceCategoryController { public class TermsOfAddressCategoryController extends PreferenceCategoryController {
private static final String TAG = "TermsOfAddressCategoryController"; private static final String TAG = "TermsOfAddressCategory";
private static final String KEY_CATEGORY_TERMS_OF_ADDRESS = "key_category_terms_of_address"; private static final String KEY_CATEGORY_TERMS_OF_ADDRESS = "key_category_terms_of_address";
private static final String KEY_TERMS_OF_ADDRESS = "key_terms_of_address"; private static final String KEY_TERMS_OF_ADDRESS = "key_terms_of_address";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
public TermsOfAddressCategoryController(Context context, String key) { public TermsOfAddressCategoryController(Context context, String key) {
super(context, key); super(context, key);
@@ -79,11 +80,13 @@ public class TermsOfAddressCategoryController extends PreferenceCategoryControll
mContext.getResources().getStringArray( mContext.getResources().getStringArray(
R.array.terms_of_address_unsupported_locales)); R.array.terms_of_address_unsupported_locales));
final Locale locale = localeInfo.getLocale(); final Locale locale = localeInfo.getLocale().stripExtensions();
final String language = locale.getLanguage(); final String language = locale.getLanguage();
final String localeTag = locale.toLanguageTag(); final String localeTag = locale.toLanguageTag();
if (DEBUG) {
Log.d(TAG, "current language: " + language); Log.d(TAG, "current language: " + language);
Log.d(TAG, "current locale tag: " + localeTag); Log.d(TAG, "current locale tag: " + localeTag);
}
// Supported locales: // Supported locales:
// 1. All French is supported except fr-CA. // 1. All French is supported except fr-CA.