[Audiosharing] UI refinement.
1. Add top summary for Audio sharing page.
2. Move Audio sharing entrance to the second place on Connection
preferences page.
3. Make Audio sharing page searchable.
4. Add On/Off summary to Audio sharing preference on Connection
preference page.
Test: atest
Bug: 305620450
Change-Id: I00019e53563afc0a539934fbdfa949c3401e78b9
diff --git a/res/xml/bluetooth_audio_sharing.xml b/res/xml/bluetooth_audio_sharing.xml
index d3aad22..ba3c083 100644
--- a/res/xml/bluetooth_audio_sharing.xml
+++ b/res/xml/bluetooth_audio_sharing.xml
@@ -19,6 +19,11 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/audio_sharing_title">
+ <com.android.settingslib.widget.TopIntroPreference
+ android:key="audio_sharing_top_intro"
+ android:title="Let others listen to your media along with you using their own compatible headphones"
+ settings:searchable="false" />
+
<PreferenceCategory
android:key="audio_sharing_device_volume_group"
android:title="Devices listening"
diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index 1d2dd24..34a5798 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -23,8 +23,8 @@
<com.android.settings.slices.SlicePreference
android:key="bt_nearby_slice"
android:title="@string/summary_placeholder"
- settings:controller="com.android.settings.slices.SlicePreferenceController"
- settings:allowDividerBelow="true"/>
+ settings:allowDividerBelow="true"
+ settings:controller="com.android.settings.slices.SlicePreferenceController" />
<PreferenceCategory
android:key="audio_sharing_device_list"
@@ -32,33 +32,33 @@
settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingDevicePreferenceController">
<Preference
android:fragment="com.android.settings.connecteddevice.audiosharing.AudioSharingDashboardFragment"
- android:key="connected_device_audio_sharing_settings"
- android:title="@string/audio_sharing_title"
android:icon="@drawable/ic_bt_audio_sharing"
+ android:key="connected_device_audio_sharing_settings"
android:order="10"
- settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingPreferenceController"/>
+ android:title="@string/audio_sharing_title"
+ settings:searchable="false" />
</PreferenceCategory>
<PreferenceCategory
android:key="available_device_list"
android:title="@string/connected_device_media_device_title"
- settings:controller="com.android.settings.connecteddevice.AvailableMediaDeviceGroupController"/>
+ settings:controller="com.android.settings.connecteddevice.AvailableMediaDeviceGroupController" />
<PreferenceCategory
android:key="connected_device_list"
android:title="@string/connected_device_other_device_title"
- settings:controller="com.android.settings.connecteddevice.ConnectedDeviceGroupController"/>
+ settings:controller="com.android.settings.connecteddevice.ConnectedDeviceGroupController" />
<com.android.settingslib.RestrictedPreference
- android:key="add_bt_devices"
- android:title="@string/bluetooth_pairing_pref_title"
- android:icon="@drawable/ic_add_24dp"
- android:summary="@string/connected_device_add_device_summary"
android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"
+ android:icon="@drawable/ic_add_24dp"
+ android:key="add_bt_devices"
+ android:summary="@string/connected_device_add_device_summary"
+ android:title="@string/bluetooth_pairing_pref_title"
+ settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"
settings:keywords="@string/keywords_add_bt_device"
- settings:userRestriction="no_config_bluetooth"
settings:useAdminDisabledSummary="true"
- settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>
+ settings:userRestriction="no_config_bluetooth" />
<PreferenceCategory
android:key="previously_connected_devices"
@@ -66,12 +66,12 @@
settings:controller="com.android.settings.connecteddevice.PreviouslyConnectedDevicePreferenceController">
<Preference
- android:key="previously_connected_devices_see_all"
- android:title="@string/previous_connected_see_all"
+ android:fragment="com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment"
android:icon="@drawable/ic_chevron_right_24dp"
+ android:key="previously_connected_devices_see_all"
android:order="10"
- settings:searchable="false"
- android:fragment="com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment"/>
+ android:title="@string/previous_connected_see_all"
+ settings:searchable="false" />
</PreferenceCategory>
<PreferenceCategory
@@ -81,27 +81,27 @@
"com.android.settings.connecteddevice.fastpair.FastPairDevicePreferenceController">
<Preference
- android:key="fast_pair_devices_see_all"
- android:title="@string/connected_device_fast_pair_device_see_all"
- android:icon="@drawable/ic_chevron_right_24dp"
- android:order="10"
- settings:searchable="false"
android:fragment=
- "com.android.settings.connecteddevice.fastpair.FastPairDeviceDashboardFragment"/>
+ "com.android.settings.connecteddevice.fastpair.FastPairDeviceDashboardFragment"
+ android:icon="@drawable/ic_chevron_right_24dp"
+ android:key="fast_pair_devices_see_all"
+ android:order="10"
+ android:title="@string/connected_device_fast_pair_device_see_all"
+ settings:searchable="false" />
</PreferenceCategory>
<Preference
- android:key="connection_preferences"
- android:title="@string/connected_device_connections_title"
- android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"
+ android:key="connection_preferences"
+ android:summary="@string/summary_placeholder"
+ android:title="@string/connected_device_connections_title"
settings:allowDividerAbove="true"
- settings:controller="com.android.settings.connecteddevice.AdvancedConnectedDeviceController"/>
+ settings:controller="com.android.settings.connecteddevice.AdvancedConnectedDeviceController" />
<com.android.settingslib.widget.FooterPreference
android:key="discoverable_footer"
- android:title="@string/bluetooth_off_footer"
android:selectable="false"
+ android:title="@string/bluetooth_off_footer"
settings:controller="com.android.settings.connecteddevice.DiscoverableFooterPreferenceController">
</com.android.settingslib.widget.FooterPreference>
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index 364dd3d..b088791 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -21,57 +21,59 @@
<Preference
android:fragment="com.android.settings.connecteddevice.BluetoothDashboardFragment"
- android:key="bluetooth_switchbar_screen"
- android:title="@string/bluetooth_settings_title"
android:icon="@*android:drawable/ic_settings_bluetooth"
- android:order="-9"/>
+ android:key="bluetooth_switchbar_screen"
+ android:order="-10"
+ android:title="@string/bluetooth_settings_title" />
<Preference
android:fragment="com.android.settings.connecteddevice.audiosharing.AudioSharingDashboardFragment"
- android:key="audio_sharing_settings"
- android:title="@string/audio_sharing_title"
android:icon="@drawable/ic_bt_audio_sharing"
- settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingPreferenceController"/>
+ android:key="audio_sharing_settings"
+ android:order="-9"
+ android:title="@string/audio_sharing_title"
+ settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingPreferenceController"
+ settings:searchable="true" />
<com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.connecteddevice.NfcAndPaymentFragment"
- android:key="nfc_and_payment_settings"
- android:title="@string/nfc_quick_toggle_title"
android:icon="@drawable/ic_nfc"
+ android:key="nfc_and_payment_settings"
android:order="-7"
- settings:searchable="false"
+ android:title="@string/nfc_quick_toggle_title"
settings:controller="com.android.settings.connecteddevice.NfcAndPaymentFragmentController"
- settings:userRestriction="no_near_field_communication_radio"
- settings:useAdminDisabledSummary="true"/>
+ settings:searchable="false"
+ settings:useAdminDisabledSummary="true"
+ settings:userRestriction="no_near_field_communication_radio" />
<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:key="wifi_display_settings"
android:order="-6"
+ android:title="@string/wifi_display_settings_title"
settings:controller="com.android.settings.wfd.WifiDisplayPreferenceController"
- settings:keywords="@string/keywords_wifi_display_settings"/>
+ settings:keywords="@string/keywords_wifi_display_settings" />
<com.android.settingslib.RestrictedPreference
- android:key="connected_device_printing"
- android:title="@string/print_settings"
- android:summary="@string/summary_placeholder"
- android:icon="@*android:drawable/ic_settings_print"
android:fragment="com.android.settings.print.PrintSettingsFragment"
- android:order="-3"/>
+ android:icon="@*android:drawable/ic_settings_print"
+ android:key="connected_device_printing"
+ android:order="-3"
+ android:summary="@string/summary_placeholder"
+ android:title="@string/print_settings" />
<com.android.settingslib.RestrictedSwitchPreference
android:key="uwb_settings"
- android:title="@string/uwb_settings_title"
android:order="100"
android:summary="@string/summary_placeholder"
+ android:title="@string/uwb_settings_title"
settings:controller="com.android.settings.uwb.UwbPreferenceController"
- settings:userRestriction="no_ultra_wideband_radio"
- settings:useAdminDisabledSummary="true"/>
+ settings:useAdminDisabledSummary="true"
+ settings:userRestriction="no_ultra_wideband_radio" />
<PreferenceCategory
android:key="dashboard_tile_placeholder"
- android:order="-8"/>
+ android:order="-8" />
</PreferenceScreen>