Merge "[Temp bonding] Add guest device section to connected device page." into main

This commit is contained in:
Ze Li
2025-01-21 00:13:58 -08:00
committed by Android (Google) Code Review
4 changed files with 15 additions and 1 deletions

View File

@@ -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);