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

Commit a2577fd6 authored by Yiyi Shen's avatar Yiyi Shen
Browse files

[Audiosharing] Impl audio sharing feature provider in Settings 

Bug: 324023639
Test: manual
Change-Id: I4005ea8fbc0983a833f5a7dee2815f09eab48d3c
parent 38e6e7f5

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

+30 −21
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.util.Log; 
import androidx.preference.Preference;



import com.android.settings.connecteddevice.DevicePreferenceCallback;

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

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -72,30 +72,43 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater 
        if (isDeviceConnected(cachedDevice) && isDeviceInCachedDevicesList(cachedDevice)) {

            Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile);



            // If device is Hearing Aid, it is compatible with HFP and A2DP.

            // It would show in Available Devices group.

            if (cachedDevice.isConnectedAshaHearingAidDevice()) {

            // If device is LE Audio, it is compatible with HFP and A2DP.

            // It would show in Available Devices group if the audio sharing flag is disabled or

            // the device is not in the audio sharing session.

            if (cachedDevice.isConnectedLeAudioDevice()) {

                boolean isAudioSharingFilterMatched =

                        FeatureFactory.getFeatureFactory()

                                .getAudioSharingFeatureProvider()

                                .isAudioSharingFilterMatched(cachedDevice, mLocalManager);

                if (!isAudioSharingFilterMatched) {

                    Log.d(

                            TAG,

                            "isFilterMatched() device : "

                                    + cachedDevice.getName()

                                + ", the Hearing Aid profile is connected.");

                                    + ", the LE Audio profile is connected and not in sharing "

                                    + "if broadcast enabled.");

                    return true;

                } else {

                    Log.d(

                            TAG,

                            "Filter out device : "

                                    + cachedDevice.getName()

                                    + ", it is in audio sharing.");

                    return false;

                }

            // If device is LE Audio, it is compatible with HFP and A2DP.

            // It would show in Available Devices group if the audio sharing flag is disabled or

            // the device is not in the audio sharing session.

            if (cachedDevice.isConnectedLeAudioDevice()) {

                if (!AudioSharingUtils.isFeatureEnabled()

                        || !AudioSharingUtils.hasBroadcastSource(cachedDevice, mLocalManager)) {

            }



            // If device is Hearing Aid, it is compatible with HFP and A2DP.

            // It would show in Available Devices group.

            if (cachedDevice.isConnectedAshaHearingAidDevice()) {

                Log.d(

                        TAG,

                        "isFilterMatched() device : "

                                + cachedDevice.getName()

                                    + ", the LE Audio profile is connected and not in sharing.");

                                + ", the Hearing Aid profile is connected.");

                return true;

            }

            }



            // According to the current audio profile type,

            // this page will show the bluetooth device that have corresponding profile.

            // For example:
@@ -125,13 +138,9 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater 
        mMetricsFeatureProvider.logClickedPreference(preference, mMetricsCategory);

        final CachedBluetoothDevice device =

                ((BluetoothDevicePreference) preference).getBluetoothDevice();

        if (AudioSharingUtils.isFeatureEnabled()

                && AudioSharingUtils.isBroadcasting(mLocalBtManager)) {

            if (DBG) {

                Log.d(TAG, "onPreferenceClick stop broadcasting.");

            }

            AudioSharingUtils.stopBroadcasting(mLocalBtManager);

        }

        FeatureFactory.getFeatureFactory()

                .getAudioSharingFeatureProvider()

                .handleMediaDeviceOnClick(mLocalManager);

        return device.setActive();

    }

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

+37 −5
Original line number Diff line number Diff line
@@ -22,12 +22,13 @@ import android.provider.DeviceConfig; 
import android.text.TextUtils;

import android.util.Log;



import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.lifecycle.Lifecycle;



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.AudioSharingUtils;

import com.android.settings.core.SettingsUIDeviceConfig;

import com.android.settings.dashboard.DashboardFragment;
@@ -36,8 +37,12 @@ import com.android.settings.overlay.SurveyFeatureProvider; 
import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.slices.SlicePreferenceController;

import com.android.settingslib.bluetooth.HearingAidStatsLogUtils;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.search.SearchIndexable;



import java.util.ArrayList;

import java.util.List;



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

public class ConnectedDeviceDashboardFragment extends DashboardFragment {
@@ -87,9 +92,6 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { 
                            + ", action : "

                            + action);

        }

        if (AudioSharingUtils.isFeatureEnabled()) {

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

        }

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

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

        use(PreviouslyConnectedDevicePreferenceController.class).init(this);
@@ -112,6 +114,29 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { 
        }

    }



    @Override

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        return buildPreferenceControllers(context, /* fragment= */ this, getSettingsLifecycle());

    }



    private static List<AbstractPreferenceController> buildPreferenceControllers(

            Context context,

            @Nullable ConnectedDeviceDashboardFragment fragment,

            @Nullable Lifecycle lifecycle) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        if (AudioSharingUtils.isFeatureEnabled()) {

            AbstractPreferenceController audioSharingController =

                    FeatureFactory.getFeatureFactory()

                            .getAudioSharingFeatureProvider()

                            .createAudioSharingDevicePreferenceController(

                                    context, fragment, lifecycle);

            if (audioSharingController != null) {

                controllers.add(audioSharingController);

            }

        }

        return controllers;

    }



    @VisibleForTesting

    boolean isAlwaysDiscoverable(String callingAppPackageName, String action) {

        return TextUtils.equals(SLICE_ACTION, action)
@@ -122,5 +147,12 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { 


    /** For Search. */

    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.connected_devices);

            new BaseSearchIndexProvider(R.xml.connected_devices) {

                @Override

                public List<AbstractPreferenceController> createPreferenceControllers(

                        Context context) {

                    return buildPreferenceControllers(

                            context, /* fragment= */ null, /* lifecycle= */ null);

                }

            };

}

src/com/android/settings/connecteddevice/audiosharing/AudioSharingFeatureProvider.java

0 → 100644
+50 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.connecteddevice.audiosharing;



import android.content.Context;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.lifecycle.Lifecycle;



import com.android.settings.dashboard.DashboardFragment;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.core.AbstractPreferenceController;



/** Feature provider for the audio sharing related features, */

public interface AudioSharingFeatureProvider {



    /** Create audio sharing device preference controller. */

    @Nullable

    AbstractPreferenceController createAudioSharingDevicePreferenceController(

            @NonNull Context context,

            @Nullable DashboardFragment fragment,

            @Nullable Lifecycle lifecycle);



    /**

     * Check if the device match the audio sharing filter.

     *

     * <p>The filter is used to filter device in "Media devices" section.

     */

    boolean isAudioSharingFilterMatched(

            @NonNull CachedBluetoothDevice cachedDevice, LocalBluetoothManager localBtManager);



    /** Handle preference onClick in "Media devices" section. */

    void handleMediaDeviceOnClick(LocalBluetoothManager localBtManager);

}

src/com/android/settings/connecteddevice/audiosharing/AudioSharingFeatureProviderImpl.java

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.connecteddevice.audiosharing;



import android.content.Context;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.lifecycle.Lifecycle;



import com.android.settings.dashboard.DashboardFragment;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.core.AbstractPreferenceController;



public class AudioSharingFeatureProviderImpl implements AudioSharingFeatureProvider {



    @Nullable

    @Override

    public AbstractPreferenceController createAudioSharingDevicePreferenceController(

            @NonNull Context context,

            @Nullable DashboardFragment fragment,

            @Nullable Lifecycle lifecycle) {

        return null;

    }



    @Override

    public boolean isAudioSharingFilterMatched(

            @NonNull CachedBluetoothDevice cachedDevice, LocalBluetoothManager localBtManager) {

        return false;

    }



    @Override

    public void handleMediaDeviceOnClick(LocalBluetoothManager localBtManager) {}

}

src/com/android/settings/overlay/FeatureFactory.kt

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.settings.biometrics.face.FaceFeatureProvider 
import com.android.settings.biometrics.fingerprint.FingerprintFeatureProvider

import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider

import com.android.settings.bluetooth.BluetoothFeatureProvider

import com.android.settings.connecteddevice.audiosharing.AudioSharingFeatureProvider

import com.android.settings.connecteddevice.fastpair.FastPairFeatureProvider

import com.android.settings.connecteddevice.stylus.StylusFeatureProvider

import com.android.settings.dashboard.DashboardFeatureProvider
@@ -182,6 +183,11 @@ abstract class FeatureFactory { 
     */

    abstract val displayFeatureProvider: DisplayFeatureProvider



    /**

     * Gets implementation for audio sharing related feature.

     */

    abstract val audioSharingFeatureProvider: AudioSharingFeatureProvider



    companion object {

        private var _factory: FeatureFactory? = null