Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev am: bec6e40dd3

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

Change-Id: I109e6ac5d761f9a246991b34e4434bbf951b3d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-03-15 09:13:34 +00:00
committed by Automerger Merge Worker

View File

@@ -23,6 +23,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.internal.app.LocaleHelper;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -53,9 +54,8 @@ public class NumberingPreferencesFragment extends DashboardFragment {
Log.w(getLogTag(), "No selected language.");
return "";
}
return Locale.forLanguageTag(selectedLanguage)
.stripExtensions()
.getDisplayName(Locale.forLanguageTag(selectedLanguage));
Locale locale = Locale.forLanguageTag(selectedLanguage);
return LocaleHelper.getDisplayName(locale.stripExtensions(), locale, true);
}
Log.w(getLogTag(), "Incorrect option : " + option);
return "";