Merge "Add PrefController in XML support"
This commit is contained in:
committed by
Android (Google) Code Review
commit
84e8c795b1
@@ -97,6 +97,7 @@
|
||||
<!-- For Search -->
|
||||
<declare-styleable name="Preference">
|
||||
<attr name="keywords" format="string" />
|
||||
<attr name="controller" format="string" />
|
||||
</declare-styleable>
|
||||
|
||||
<!-- For DotsPageIndicator -->
|
||||
|
@@ -25,8 +25,9 @@
|
||||
<Preference
|
||||
android:key="brightness"
|
||||
android:title="@string/brightness"
|
||||
settings:keywords="@string/keywords_display_brightness_level">
|
||||
<intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
|
||||
settings:keywords="@string/keywords_display_brightness_level"
|
||||
settings:controller="com.android.settings.display.AutoBrightnessPreferenceController">
|
||||
<intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
|
||||
</Preference>
|
||||
|
||||
<com.android.settings.display.NightDisplayPreference
|
||||
|
@@ -26,7 +26,8 @@
|
||||
android:title="@string/gesture_preference_title"
|
||||
android:icon="@drawable/ic_settings_gestures"
|
||||
android:order="-250"
|
||||
android:fragment="com.android.settings.gestures.GestureSettings" />
|
||||
android:fragment="com.android.settings.gestures.GestureSettings"
|
||||
settings:controller="com.android.settings.gestures.GesturesSettingPreferenceController"/>
|
||||
|
||||
<!-- Backup -->
|
||||
<Preference
|
||||
@@ -34,7 +35,8 @@
|
||||
android:title="@string/privacy_settings_title"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:icon="@drawable/ic_settings_backup"
|
||||
android:order="-60">
|
||||
android:order="-60"
|
||||
settings:controller="com.android.settings.backup.BackupSettingsActivityPreferenceController">
|
||||
<intent android:action="android.settings.BACKUP_AND_RESET_SETTINGS" />
|
||||
</Preference>
|
||||
|
||||
@@ -44,14 +46,16 @@
|
||||
android:title="@string/system_update_settings_list_item_title"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:icon="@drawable/ic_system_update"
|
||||
android:order="-30">
|
||||
android:order="-30"
|
||||
settings:controller="com.android.settings.deviceinfo.SystemUpdatePreferenceController">
|
||||
<intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
|
||||
</Preference>
|
||||
|
||||
<Preference
|
||||
android:key="additional_system_update_settings"
|
||||
android:title="@string/additional_system_update_settings_list_item_title"
|
||||
android:order="-31">
|
||||
android:order="-31"
|
||||
settings:controller="com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController">
|
||||
<intent android:action="android.intent.action.MAIN"
|
||||
android:targetPackage="@string/additional_system_update"
|
||||
android:targetClass="@string/additional_system_update_menu" />
|
||||
|
Reference in New Issue
Block a user