[PixelSettings] Group each preference by category and add android:key
Bug: 376172757
Test: manual
Flag: EXEMPT resource only update
Change-Id: I6bfe9f48e90f5022cf474043ff57306619d95b44
diff --git a/res/xml/regional_preference_main_page.xml b/res/xml/regional_preference_main_page.xml
index 5c46f8c..704019f 100644
--- a/res/xml/regional_preference_main_page.xml
+++ b/res/xml/regional_preference_main_page.xml
@@ -20,41 +20,46 @@
android:key="regional_preferences">
<com.android.settingslib.widget.TopIntroPreference
+ android:key="regional_pref_intro"
android:title="@string/regional_preferences_main_page_sub_title"
- android:persistent="false" />
+ android:persistent="false"/>
- <Preference
- android:key="key_temperature_unit"
- android:title="@string/temperature_preferences_title"
- android:summary="@string/default_string_of_regional_preference"
- settings:controller="com.android.settings.regionalpreferences.TemperatureUnitController"
- settings:fragment="com.android.settings.regionalpreferences.TemperatureUnitFragment">
- <extra
- android:name="arg_key_regional_preference"
- android:value="mu" />
- </Preference>
+ <PreferenceCategory
+ android:key="regional_preferences_category"
+ android:layout="@layout/settingslib_preference_category_no_title">
+ <Preference
+ android:key="key_temperature_unit"
+ android:title="@string/temperature_preferences_title"
+ android:summary="@string/default_string_of_regional_preference"
+ settings:controller="com.android.settings.regionalpreferences.TemperatureUnitController"
+ settings:fragment="com.android.settings.regionalpreferences.TemperatureUnitFragment">
+ <extra
+ android:name="arg_key_regional_preference"
+ android:value="mu"/>
+ </Preference>
- <Preference
- android:key="key_first_day_of_week"
- android:title="@string/first_day_of_week_preferences_title"
- android:summary="@string/default_string_of_regional_preference"
- settings:controller="com.android.settings.regionalpreferences.FirstDayOfWeekController"
- settings:fragment="com.android.settings.regionalpreferences.FirstDayOfWeekItemFragment">
- <extra
- android:name="arg_key_regional_preference"
- android:value="fw" />
- </Preference>
+ <Preference
+ android:key="key_first_day_of_week"
+ android:title="@string/first_day_of_week_preferences_title"
+ android:summary="@string/default_string_of_regional_preference"
+ settings:controller="com.android.settings.regionalpreferences.FirstDayOfWeekController"
+ settings:fragment="com.android.settings.regionalpreferences.FirstDayOfWeekItemFragment">
+ <extra
+ android:name="arg_key_regional_preference"
+ android:value="fw"/>
+ </Preference>
- <Preference
- android:key="key_numbering_system"
- android:title="@string/numbers_preferences_title"
- android:summary="@string/default_string_of_regional_preference"
- settings:controller="com.android.settings.regionalpreferences.NumberingSystemController"
- settings:fragment="com.android.settings.regionalpreferences.NumberingPreferencesFragment">
- <extra
- android:name="arg_key_regional_preference"
- android:value="arg_value_language_select" />
- </Preference>
+ <Preference
+ android:key="key_numbering_system"
+ android:title="@string/numbers_preferences_title"
+ android:summary="@string/default_string_of_regional_preference"
+ settings:controller="com.android.settings.regionalpreferences.NumberingSystemController"
+ settings:fragment="com.android.settings.regionalpreferences.NumberingPreferencesFragment">
+ <extra
+ android:name="arg_key_regional_preference"
+ android:value="arg_value_language_select"/>
+ </Preference>
+ </PreferenceCategory>
<com.android.settingslib.widget.FooterPreference
android:key="regional_pref_footer"
diff --git a/res/xml/regional_preferences_first_day_of_week.xml b/res/xml/regional_preferences_first_day_of_week.xml
index d9de5e5..2848748 100644
--- a/res/xml/regional_preferences_first_day_of_week.xml
+++ b/res/xml/regional_preferences_first_day_of_week.xml
@@ -21,6 +21,7 @@
android:key="regional_preference_first_day_of_week">
<com.android.settingslib.widget.TopIntroPreference
+ android:key="first_day_of_week_intro"
android:title="@string/regional_preferences_option_page_sub_title"
android:persistent="false" />
diff --git a/res/xml/regional_preferences_temperature.xml b/res/xml/regional_preferences_temperature.xml
index 2519dfa..888a0ec 100644
--- a/res/xml/regional_preferences_temperature.xml
+++ b/res/xml/regional_preferences_temperature.xml
@@ -21,6 +21,7 @@
android:key="regional_preference_temperature">
<com.android.settingslib.widget.TopIntroPreference
+ android:key="temperature_unit_intro"
android:title="@string/regional_preferences_option_page_sub_title"
android:persistent="false" />