Merge "[Audiosharing] Add feature gates as utils." into main (fa4a0cac) · Commits · e / os / android_packages_apps_Settings

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,9 +28,9 @@ 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;
		import com.android.settings.flags.Flags;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.overlay.SurveyFeatureProvider;
		import com.android.settings.search.BaseSearchIndexProvider;
		@@ -87,7 +87,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
		+ ", action : "
		+ action);
		}
		if (Flags.enableLeAudioSharing()) {
		if (AudioSharingUtils.isFeatureEnabled()) {
		use(AudioSharingDevicePreferenceController.class).init(this);
		}
		use(AvailableMediaDeviceGroupController.class).init(this);

+1 −2

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import androidx.preference.PreferenceScreen;

		import com.android.settings.bluetooth.Utils;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.flags.Flags;
		import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
		import com.android.settingslib.bluetooth.LocalBluetoothManager;
		import com.android.settingslib.utils.ThreadUtils;
		@@ -51,7 +50,7 @@ public abstract class AudioSharingBasePreferenceController extends BasePreferenc

		@Override
		public int getAvailabilityStatus() {
		return Flags.enableLeAudioSharing() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
		return AudioSharingUtils.isFeatureEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
		}

		@Override

+1 −5

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.bluetooth.BluetoothLeBroadcastMetadata;
		import android.bluetooth.BluetoothLeBroadcastReceiveState;
		import android.bluetooth.BluetoothProfile;
		import android.content.Context;
		import android.content.pm.PackageManager;
		import android.util.Log;

		import androidx.annotation.NonNull;
		@@ -39,7 +38,6 @@ import com.android.settings.bluetooth.Utils;
		import com.android.settings.connecteddevice.DevicePreferenceCallback;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.flags.Flags;
		import com.android.settingslib.bluetooth.BluetoothCallback;
		import com.android.settingslib.bluetooth.CachedBluetoothDevice;
		import com.android.settingslib.bluetooth.LeAudioProfile;
		@@ -309,9 +307,7 @@ public class AudioSharingDevicePreferenceController extends BasePreferenceContro

		@Override
		public int getAvailabilityStatus() {
		return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
		&& Flags.enableLeAudioSharing()
		&& mBluetoothDeviceUpdater != null
		return AudioSharingUtils.isFeatureEnabled() && mBluetoothDeviceUpdater != null
		? AVAILABLE_UNSEARCHABLE
		: UNSUPPORTED_ON_DEVICE;
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import com.android.internal.widget.LinearLayoutManager;
		import com.android.internal.widget.RecyclerView;
		import com.android.settings.R;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.settings.flags.Flags;

		import java.util.ArrayList;
		import java.util.Locale;
		@@ -73,7 +72,7 @@ public class AudioSharingDialogFragment extends InstrumentedDialogFragment {
		Fragment host,
		ArrayList<AudioSharingDeviceItem> deviceItems,
		DialogEventListener listener) {
		if (!Flags.enableLeAudioSharing()) return;
		if (!AudioSharingUtils.isFeatureEnabled()) return;
		final FragmentManager manager = host.getChildFragmentManager();
		sListener = listener;
		if (manager.findFragmentByTag(TAG) == null) {

+4 −2

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import com.android.internal.widget.LinearLayoutManager;
		import com.android.internal.widget.RecyclerView;
		import com.android.settings.R;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.settings.flags.Flags;

		import java.util.ArrayList;

		@@ -66,13 +65,16 @@ public class AudioSharingDisconnectDialogFragment extends InstrumentedDialogFrag
		* Display the {@link AudioSharingDisconnectDialogFragment} dialog.
		*
		* @param host The Fragment this dialog will be hosted.
		* @param deviceItems The existing connected device items in audio sharing session.
		* @param newDeviceName The name of the latest connected device triggered this dialog.
		* @param listener The callback to handle the user action on this dialog.
		*/
		public static void show(
		Fragment host,
		ArrayList<AudioSharingDeviceItem> deviceItems,
		String newDeviceName,
		DialogEventListener listener) {
		if (!Flags.enableLeAudioSharing()) return;
		if (!AudioSharingUtils.isFeatureEnabled()) return;
		final FragmentManager manager = host.getChildFragmentManager();
		sListener = listener;
		if (manager.findFragmentByTag(TAG) == null) {