Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2141d62f authored by Ze Li's avatar Ze Li
Browse files

[Temp bonding] Add guest device section to connected device page. 

Test: com.android.settings.connecteddevice.audiosharing.TemporaryBondDeviceGroupControllerTest, com.android.settings.connecteddevice.audiosharing.TemporaryBondDeviceGroupUpdaterTest
Bug: 362859132
Flag: com.android.settingslib.flags.enable_temporary_bond_devices_ui
Change-Id: I699ac451e4d1570173ad527658d6aeab70ce354b
parent 73845cd4

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -305,6 +305,8 @@ 








    <!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->









    <string name="connected_device_media_device_title">Media devices</string>









    <!-- Title for temporary bond device group [CHAR LIMIT=none]-->









    <string name="connected_device_temp_bond_device_title">Guest devices</string>









    <!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->









    <string name="connected_device_call_device_title">Call devices</string>









    <!-- Title for connected device group [CHAR LIMIT=none]-->

























res/xml/connected_devices.xml



+5
−0






























Original line number
Diff line number
Diff line







@@ -39,6 +39,11 @@







            settings:searchable="false" />









    </PreferenceCategory>



















    <PreferenceCategory









        android:key="temp_bond_device_list"









        android:title="@string/connected_device_temp_bond_device_title"









        settings:controller="com.android.settings.connecteddevice.audiosharing.TemporaryBondDeviceGroupController" />



















    <PreferenceCategory









        android:key="available_device_list"









        android:title="@string/connected_device_media_device_title"
































src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java



+5
−0






























Original line number
Diff line number
Diff line







@@ -27,6 +27,7 @@ import com.android.settings.R;







import com.android.settings.SettingsActivity;









import com.android.settings.Utils;









import com.android.settings.connecteddevice.audiosharing.AudioSharingDevicePreferenceController;









import com.android.settings.connecteddevice.audiosharing.TemporaryBondDeviceGroupController;









import com.android.settings.dashboard.DashboardFragment;









import com.android.settings.overlay.FeatureFactory;









import com.android.settings.overlay.SurveyFeatureProvider;








@@ -34,6 +35,7 @@ import com.android.settings.search.BaseSearchIndexProvider;







import com.android.settings.slices.SlicePreferenceController;









import com.android.settingslib.bluetooth.BluetoothUtils;









import com.android.settingslib.bluetooth.HearingAidStatsLogUtils;









import com.android.settingslib.flags.Flags;









import com.android.settingslib.search.SearchIndexable;



















@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)








@@ -82,6 +84,9 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {







        }









        if (BluetoothUtils.isAudioSharingUIAvailable(context)) {









            use(AudioSharingDevicePreferenceController.class).init(this);









            if (Flags.enableTemporaryBondDevicesUi()) {









                use(TemporaryBondDeviceGroupController.class).init(this);









            }









        }









        use(AvailableMediaDeviceGroupController.class).init(this);









        use(ConnectedDeviceGroupController.class).init(this);
































tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java



+3
−1






























Original line number
Diff line number
Diff line







@@ -75,6 +75,7 @@ public class ConnectedDeviceDashboardFragmentTest {







    private static final String KEY_AUDIO_SHARING_SETTINGS =









            "connected_device_audio_sharing_settings";









    private static final String KEY_ADD_BT_DEVICES = "add_bt_devices";









    private static final String KEY_TEMPORARY_BOND_DEVICES = "temp_bond_device_list";









    private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";









    private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";









    private static final String SLICE_ACTION = "com.android.settings.SEARCH_RESULT_TRAMPOLINE";








@@ -129,7 +130,8 @@ public class ConnectedDeviceDashboardFragmentTest {







                        KEY_SAVED_DEVICE_SEE_ALL,









                        KEY_FAST_PAIR_DEVICE_SEE_ALL,









                        KEY_AUDIO_SHARING_DEVICES,









                        KEY_AUDIO_SHARING_SETTINGS);









                        KEY_AUDIO_SHARING_SETTINGS,









                        KEY_TEMPORARY_BOND_DEVICES);









    }



















    @Test