Merge "Fix incorrect region" into main (3dcc09cc) · Commits · e / os / android_packages_apps_Settings

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -111,7 +111,7 @@ public class LocalePickerWithRegionActivity extends SettingsBaseActivity
	@Override		@Override
	public void onLocaleSelected(LocaleStore.LocaleInfo locale) {		public void onLocaleSelected(LocaleStore.LocaleInfo locale) {
	if (Flags.regionalPreferencesApiEnabled()) {		if (Flags.regionalPreferencesApiEnabled()) {
	if (sameLanguageAndScript(locale.getLocale(), Locale.getDefault())) {		if (sameLanguageAndScript(locale.getLocale(), LocaleList.getDefault().get(0))) {
	Bundle args = new Bundle();		Bundle args = new Bundle();
	args.putInt(ARG_DIALOG_TYPE, DIALOG_CHANGE_LOCALE_REGION);		args.putInt(ARG_DIALOG_TYPE, DIALOG_CHANGE_LOCALE_REGION);
	args.putSerializable(ARG_TARGET_LOCALE, locale);		args.putSerializable(ARG_TARGET_LOCALE, locale);

src/com/android/settings/regionalpreferences/RegionPickerBaseListPreferenceController.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ package com.android.settings.regionalpreferences;

	import android.content.Context;		import android.content.Context;
	import android.os.Bundle;		import android.os.Bundle;
			import android.os.LocaleList;
	import android.util.Log;		import android.util.Log;

	import androidx.annotation.NonNull;		import androidx.annotation.NonNull;
	@@ -91,7 +92,7 @@ public abstract class RegionPickerBaseListPreferenceController extends BasePrefe
	? getSuggestedLocaleList()		? getSuggestedLocaleList()
	: getSupportedLocaleList();		: getSupportedLocaleList();
	if (getPreferenceCategoryKey().contains(KEY_SUGGESTED)) {		if (getPreferenceCategoryKey().contains(KEY_SUGGESTED)) {
	Locale systemLocale = Locale.getDefault();		Locale systemLocale = LocaleList.getDefault().get(0);
	LocaleStore.LocaleInfo localeInfo = LocaleStore.getLocaleInfo(systemLocale);		LocaleStore.LocaleInfo localeInfo = LocaleStore.getLocaleInfo(systemLocale);
	result.add(localeInfo);		result.add(localeInfo);
	}		}
	@@ -105,7 +106,7 @@ public abstract class RegionPickerBaseListPreferenceController extends BasePrefe
	mPreferenceCategory.addPreference(pref);		mPreferenceCategory.addPreference(pref);
	pref.setTitle(locale.getFullCountryNameNative());		pref.setTitle(locale.getFullCountryNameNative());
	pref.setKey(locale.toString());		pref.setKey(locale.toString());
	if (locale.getLocale().equals(Locale.getDefault())) {		if (locale.getLocale().equals(LocaleList.getDefault().get(0))) {
	pref.setChecked(true);		pref.setChecked(true);
	} else {		} else {
	pref.setChecked(false);		pref.setChecked(false);

src/com/android/settings/regionalpreferences/RegionPickerFragment.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@ package com.android.settings.regionalpreferences;
	import android.app.settings.SettingsEnums;		import android.app.settings.SettingsEnums;
	import android.content.Context;		import android.content.Context;
	import android.os.Bundle;		import android.os.Bundle;
			import android.os.LocaleList;
	import android.provider.Settings;		import android.provider.Settings;

	import androidx.annotation.NonNull;		import androidx.annotation.NonNull;
	@@ -83,7 +84,7 @@ public class RegionPickerFragment extends DashboardFragment{

	private List<AbstractPreferenceController> buildPreferenceControllers(		private List<AbstractPreferenceController> buildPreferenceControllers(
	@NonNull Context context) {		@NonNull Context context) {
	Locale parentLocale = LocaleStore.getLocaleInfo(Locale.getDefault()).getParent();		Locale parentLocale = LocaleStore.getLocaleInfo(LocaleList.getDefault().get(0)).getParent();
	LocaleStore.LocaleInfo parentLocaleInfo = LocaleStore.getLocaleInfo(parentLocale);		LocaleStore.LocaleInfo parentLocaleInfo = LocaleStore.getLocaleInfo(parentLocale);
	SystemRegionSuggestedListPreferenceController mSuggestedListPreferenceController =		SystemRegionSuggestedListPreferenceController mSuggestedListPreferenceController =
	new SystemRegionSuggestedListPreferenceController(		new SystemRegionSuggestedListPreferenceController(

src/com/android/settings/regionalpreferences/RegionPreferenceController.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package com.android.settings.regionalpreferences;		package com.android.settings.regionalpreferences;

	import android.content.Context;		import android.content.Context;
			import android.os.LocaleList;

	import androidx.annotation.NonNull;		import androidx.annotation.NonNull;
	import androidx.preference.Preference;		import androidx.preference.Preference;
	@@ -26,8 +27,6 @@ import com.android.internal.app.LocaleStore;
	import com.android.settings.core.BasePreferenceController;		import com.android.settings.core.BasePreferenceController;
	import com.android.settings.flags.Flags;		import com.android.settings.flags.Flags;

	import java.util.Locale;

	/** A controller for the entry of region picker page */		/** A controller for the entry of region picker page */
	public class RegionPreferenceController extends BasePreferenceController {		public class RegionPreferenceController extends BasePreferenceController {

	@@ -39,7 +38,8 @@ public class RegionPreferenceController extends BasePreferenceController {
	public void displayPreference(@NonNull PreferenceScreen screen) {		public void displayPreference(@NonNull PreferenceScreen screen) {
	super.displayPreference(screen);		super.displayPreference(screen);
	Preference preference = screen.findPreference(getPreferenceKey());		Preference preference = screen.findPreference(getPreferenceKey());
	LocaleStore.LocaleInfo localeInfo = LocaleStore.getLocaleInfo(Locale.getDefault());		LocaleStore.LocaleInfo localeInfo = LocaleStore.getLocaleInfo(
			LocaleList.getDefault().get(0));
	preference.setSummary(localeInfo.getFullCountryNameNative());		preference.setSummary(localeInfo.getFullCountryNameNative());
	}		}