Merge "Use flag to control the hierarchy tree changes" into main
This commit is contained in:
@@ -48,6 +48,45 @@
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="regional_preferences_category"
|
||||
android:title="@string/regional_preferences_category_title"
|
||||
settings:controller="com.android.settings.regionalpreferences.RegionalPreferencesCategoryController">
|
||||
|
||||
<Preference
|
||||
android:key="temperature_preference"
|
||||
android:title="@string/temperature_preferences_title"
|
||||
android:summary="@string/default_string_of_regional_preference"
|
||||
settings:controller="com.android.settings.regionalpreferences.NewTemperatureUnitController"
|
||||
settings:fragment="com.android.settings.regionalpreferences.TemperatureUnitFragment">
|
||||
<extra
|
||||
android:name="arg_key_regional_preference"
|
||||
android:value="mu"/>
|
||||
</Preference>
|
||||
|
||||
<Preference
|
||||
android:key="first_day_of_week_preference"
|
||||
android:title="@string/first_day_of_week_preferences_title"
|
||||
android:summary="@string/default_string_of_regional_preference"
|
||||
settings:controller="com.android.settings.regionalpreferences.NewFirstDayOfWeekController"
|
||||
settings:fragment="com.android.settings.regionalpreferences.FirstDayOfWeekItemFragment">
|
||||
<extra
|
||||
android:name="arg_key_regional_preference"
|
||||
android:value="fw"/>
|
||||
</Preference>
|
||||
|
||||
<Preference
|
||||
android:key="numbering_system_preference"
|
||||
android:title="@string/numbers_preferences_title"
|
||||
android:summary="@string/default_string_of_regional_preference"
|
||||
settings:controller="com.android.settings.regionalpreferences.NewNumberingSystemController"
|
||||
settings:fragment="com.android.settings.regionalpreferences.NumberingPreferencesFragment">
|
||||
<extra
|
||||
android:name="arg_key_regional_preference"
|
||||
android:value="arg_value_language_select"/>
|
||||
</Preference>
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="speech_category"
|
||||
android:title="@string/speech_category_title">
|
||||
@@ -69,4 +108,11 @@
|
||||
android:fragment="com.android.settings.tts.TextToSpeechSettings"
|
||||
settings:searchable="false"/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<com.android.settingslib.widget.FooterPreference
|
||||
android:key="new_regional_pref_footer"
|
||||
android:title="@string/title_regional_pref_footer"
|
||||
android:selectable="false"
|
||||
settings:searchable="false"
|
||||
settings:controller="com.android.settings.regionalpreferences.NewRegionalFooterPreferenceController"/>
|
||||
</PreferenceScreen>
|
||||
|
||||
Reference in New Issue
Block a user