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

Commit c66d7bdc authored by Ze Li's avatar Ze Li Committed by Android (Google) Code Review
Browse files

Merge changes If4a471e2,I5ed1713d into main 

* changes:
  [Temp bonding] Clean up old guest device logic as requirements changed
  [Temp bonding] Move audio sharing settings up
parents ea1cad37 220312ea

res/values/strings.xml

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








    <!-- 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



+6
−11






























Original line number
Diff line number
Diff line







@@ -26,17 +26,6 @@







        settings:allowDividerBelow="true"









        settings:controller="com.android.settings.slices.SlicePreferenceController" />



















    <PreferenceCategory









        android:key="audio_sharing_device_list"









        android:title="@string/audio_sharing_device_group_title"









        settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingDevicePreferenceController">









    </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" />



















    <Preference









        android:fragment="com.android.settings.connecteddevice.audiosharing.AudioSharingDashboardFragment"









        android:icon="@drawable/ic_bt_le_audio_sharing"








@@ -45,6 +34,12 @@







        settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingPreferenceController"









        settings:searchable="false" />



















    <PreferenceCategory









        android:key="audio_sharing_device_list"









        android:title="@string/audio_sharing_device_group_title"









        settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingDevicePreferenceController">









    </PreferenceCategory>



















    <PreferenceCategory









        android:key="available_device_list"









        android:title="@string/connected_device_media_device_title"
































src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java



+0
−9






























Original line number
Diff line number
Diff line







@@ -26,7 +26,6 @@ import com.android.settings.connecteddevice.DevicePreferenceCallback;







import com.android.settingslib.bluetooth.BluetoothUtils;









import com.android.settingslib.bluetooth.CachedBluetoothDevice;









import com.android.settingslib.bluetooth.LocalBluetoothManager;









import com.android.settingslib.flags.Flags;









import com.android.settingslib.utils.ThreadUtils;



















/** Controller to maintain available media Bluetooth devices */








@@ -61,14 +60,6 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater

















    @Override









    public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {









        // If the device is temporary bond, it shouldn't be shown here.









        if (Flags.enableTemporaryBondDevicesUi()









                && BluetoothUtils.isTemporaryBondDevice(cachedDevice.getDevice())) {









            Log.d(TAG,









                    "isFilterMatched() Filter out temporary bond device " + cachedDevice.getName());









            return false;









        }



















        final int currentAudioProfile;



















        if (mAudioMode == AudioManager.MODE_RINGTONE
































src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java



+0
−8






























Original line number
Diff line number
Diff line







@@ -57,14 +57,6 @@ public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {

















    @Override









    public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {









        // If the device is temporary bond, it shouldn't be shown here.









        if (Flags.enableTemporaryBondDevicesUi()









                && BluetoothUtils.isTemporaryBondDevice(cachedDevice.getDevice())) {









            Log.d(TAG,









                    "isFilterMatched() Filter out temporary bond device " + cachedDevice.getName());









            return false;









        }



















        final int currentAudioProfile;



















        if (mAudioMode == AudioManager.MODE_RINGTONE
































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



+0
−5






























Original line number
Diff line number
Diff line







@@ -27,7 +27,6 @@ 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;








@@ -35,7 +34,6 @@ 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)








@@ -84,9 +82,6 @@ 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);