diff --git a/res/values/strings.xml b/res/values/strings.xml
index 16d3964991c..13fe2ad99f7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -521,6 +521,8 @@
Add a language
Choose a region
+
+ Number System
Region preference
@@ -536,7 +538,7 @@
Your device will keep %1$s as a system language
- Most apps will use your regional preferences
+ Choose how your device, websites, and apps display numbers
diff --git a/src/com/android/settings/localepicker/RegionAndNumberingSystemPickerFragment.java b/src/com/android/settings/localepicker/RegionAndNumberingSystemPickerFragment.java
index 9831c137915..72a5c311245 100644
--- a/src/com/android/settings/localepicker/RegionAndNumberingSystemPickerFragment.java
+++ b/src/com/android/settings/localepicker/RegionAndNumberingSystemPickerFragment.java
@@ -34,6 +34,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.app.LocaleHelper;
@@ -42,7 +43,6 @@ import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.TopIntroPreference;
import com.google.android.material.appbar.AppBarLayout;
@@ -75,6 +75,7 @@ public class RegionAndNumberingSystemPickerFragment extends DashboardFragment im
private static final String KEY_PREFERENCE_APP_LOCALE_SUGGESTED_LIST =
"app_locale_suggested_list";
private static final String KEY_TOP_INTRO_PREFERENCE = "top_intro_region";
+ private static final String KEY_PREFERENCE_SCREEN ="key_system_language_picker_page";
private static final String EXTRA_EXPAND_SEARCH_VIEW = "expand_search_view";
@Nullable
@@ -121,9 +122,10 @@ public class RegionAndNumberingSystemPickerFragment extends DashboardFragment im
}
Log.d(TAG, "onCreate, mIsNumberingMode = " + mIsNumberingMode);
- if (!mIsNumberingMode) {
- mActivity.setTitle(R.string.region_selection_title);
- }
+
+ PreferenceScreen screen = findPreference(KEY_PREFERENCE_SCREEN);
+ screen.setTitle(mIsNumberingMode ? R.string.numbering_system_selection_title
+ : R.string.region_selection_title);
TopIntroPreference topIntroPreference = findPreference(KEY_TOP_INTRO_PREFERENCE);
if (topIntroPreference != null && mIsNumberingMode) {