Remove summary provider
- use SummaryProvider to provide the summary of UserSettings - use WifiDisplayPreferenceController to replace the summary loader in WifiDisplaySettings - use ConfigureNotificationPreferernceController to replace the sumary load in ConfigureNotificationSettings Fixes: 141653158 Test: robolectric Change-Id: Id5f5ed645707caa0b25ecae5252174cbf017651c
This commit is contained in:
@@ -46,6 +46,13 @@
|
||||
android:layout="@layout/preference_category_no_label"
|
||||
android:order="-997"/>
|
||||
|
||||
<Preference
|
||||
android:key="configure_notification_settings"
|
||||
android:title="@string/configure_notification_settings"
|
||||
android:order="-440"
|
||||
android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
|
||||
settings:controller="com.android.settings.notification.ConfigureNotificationPreferenceController"/>
|
||||
|
||||
<!-- Notifications (appears before manage_perms), default apps (appears after) -->
|
||||
<PreferenceCategory
|
||||
android:key="dashboard_tile_placeholder"
|
||||
|
||||
@@ -36,14 +36,6 @@
|
||||
settings:controller="com.android.settings.nfc.NfcPreferenceController"
|
||||
android:order="-7"/>
|
||||
|
||||
<com.android.settingslib.RestrictedPreference
|
||||
android:fragment="com.android.settings.nfc.AndroidBeam"
|
||||
android:key="android_beam_settings"
|
||||
android:title="@string/android_beam_settings_title"
|
||||
settings:controller="com.android.settings.nfc.AndroidBeamPreferenceController"
|
||||
android:icon="@drawable/ic_android"
|
||||
android:order="-6"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="nfc_secure_settings"
|
||||
android:title="@string/nfc_secure_settings_title"
|
||||
@@ -52,6 +44,23 @@
|
||||
android:summary="@string/nfc_secure_toggle_summary"
|
||||
android:order="-7"/>
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.wfd.WifiDisplaySettings"
|
||||
android:key="wifi_display_settings"
|
||||
android:title="@string/wifi_display_settings_title"
|
||||
android:icon="@drawable/ic_cast_24dp"
|
||||
android:order="-6"
|
||||
settings:searchable="false"
|
||||
settings:controller="com.android.settings.wfd.WifiDisplayPreferenceController"/>
|
||||
|
||||
<com.android.settingslib.RestrictedPreference
|
||||
android:fragment="com.android.settings.nfc.AndroidBeam"
|
||||
android:key="android_beam_settings"
|
||||
android:title="@string/android_beam_settings_title"
|
||||
settings:controller="com.android.settings.nfc.AndroidBeamPreferenceController"
|
||||
android:icon="@drawable/ic_android"
|
||||
android:order="-5"/>
|
||||
|
||||
<com.android.settingslib.RestrictedPreference
|
||||
android:key="connected_device_printing"
|
||||
android:title="@string/print_settings"
|
||||
|
||||
Reference in New Issue
Block a user