Merge "[Cleanup] Clean up flag volume_dialog_audio_sharing_fix" into main (34ddbf7f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
		import static com.android.internal.jank.InteractionJankMonitor.CUJ_VOLUME_CONTROL;
		import static com.android.internal.jank.InteractionJankMonitor.Configuration.Builder;
		import static com.android.settingslib.flags.Flags.audioSharingDeveloperOption;
		import static com.android.settingslib.flags.Flags.volumeDialogAudioSharingFix;
		import static com.android.systemui.volume.Events.DISMISS_REASON_POSTURE_CHANGED;
		import static com.android.systemui.volume.Events.DISMISS_REASON_SETTINGS_CLICKED;

		@@ -1687,7 +1686,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
		}

		// Always show the stream for audio sharing if it exists.
		if ((volumeDialogAudioSharingFix() \|\| audioSharingDeveloperOption())
		if (audioSharingDeveloperOption()
		&& row.ss != null
		&& mContext.getString(R.string.volume_dialog_guest_device_volume_description)
		.equals(row.ss.remoteLabel)) {
		@@ -1897,7 +1896,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
		if (!ss.dynamic) continue;
		mDynamic.put(stream, true);
		if (findRow(stream) == null) {
		if ((volumeDialogAudioSharingFix() \|\| audioSharingDeveloperOption())
		if (audioSharingDeveloperOption()
		&& (mContext.getString(
		R.string.volume_dialog_guest_device_volume_description)
		.equals(ss.remoteLabel))) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ interface AudioSharingModule {
		impl: Lazy<AudioSharingInteractorImpl>,
		emptyImpl: Lazy<AudioSharingInteractorEmptyImpl>,
		): AudioSharingInteractor =
		if (Flags.volumeDialogAudioSharingFix() \|\| Flags.audioSharingDeveloperOption()) {
		if (Flags.audioSharingDeveloperOption()) {
		impl.get()
		} else {
		emptyImpl.get()

+1 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ constructor(

		// Always show the stream for audio sharing if it exists.
		if (
		(Flags.volumeDialogAudioSharingFix() \|\| Flags.audioSharingDeveloperOption()) &&
		Flags.audioSharingDeveloperOption() &&
		streamModel.stream == VolumeDialogControllerImpl.DYNAMIC_STREAM_BROADCAST
		) {
		return true

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import androidx.annotation.IntRange
		import com.android.app.tracing.coroutines.launchTraced as launch
		import com.android.settingslib.bluetooth.BluetoothUtils
		import com.android.settingslib.bluetooth.CachedBluetoothDevice
		import com.android.settingslib.flags.Flags
		import com.android.settingslib.volume.data.repository.AudioSharingRepository
		import com.android.settingslib.volume.data.repository.AudioSharingRepository.Companion.AUDIO_SHARING_VOLUME_MAX
		import com.android.settingslib.volume.data.repository.AudioSharingRepository.Companion.AUDIO_SHARING_VOLUME_MIN
		@@ -115,7 +114,7 @@ constructor(

		override suspend fun audioSharingVolumeBarAvailable(@Application context: Context): Boolean =
		withContext(backgroundCoroutineContext) {
		(Flags.volumeDialogAudioSharingFix() && BluetoothUtils.isAudioSharingEnabled()) \|\|
		BluetoothUtils.isAudioSharingEnabled() \|\|
		BluetoothUtils.isAudioSharingPreviewEnabled(context.contentResolver)
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ import android.graphics.drawable.Drawable;
		import android.media.AudioManager;
		import android.media.AudioSystem;
		import android.os.SystemClock;
		import android.platform.test.annotations.EnableFlags;
		import android.provider.Settings;
		import android.testing.TestableLooper;
		import android.util.Log;
		@@ -69,7 +68,6 @@ import androidx.test.filters.SmallTest;

		import com.android.internal.jank.InteractionJankMonitor;
		import com.android.internal.logging.testing.UiEventLoggerFake;
		import com.android.settingslib.flags.Flags;
		import com.android.systemui.Prefs;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.animation.AnimatorTestRule;
		@@ -783,7 +781,6 @@ public class VolumeDialogImplTest extends SysuiTestCase {
		}

		@Test
		@EnableFlags(Flags.FLAG_VOLUME_DIALOG_AUDIO_SHARING_FIX)
		public void testDynamicStreamForBroadcast_createRow() {
		State state = createShellState();
		VolumeDialogController.StreamState ss = new VolumeDialogController.StreamState();