Merge "[Cleanup] Clean up flag audio_sharing_developer_option" into main (5c2c8647) · Commits · e / os / android_frameworks_base

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

+3 −6

Original line number	Diff line number	Diff line
		@@ -34,7 +34,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.systemui.volume.Events.DISMISS_REASON_POSTURE_CHANGED;
		import static com.android.systemui.volume.Events.DISMISS_REASON_SETTINGS_CLICKED;

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

		// Always show the stream for audio sharing if it exists.
		if (audioSharingDeveloperOption()
		&& row.ss != null
		if (row.ss != null
		&& mContext.getString(R.string.volume_dialog_guest_device_volume_description)
		.equals(row.ss.remoteLabel)) {
		return true;
		@@ -1896,10 +1894,9 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
		if (!ss.dynamic) continue;
		mDynamic.put(stream, true);
		if (findRow(stream) == null) {
		if (audioSharingDeveloperOption()
		&& (mContext.getString(
		if (mContext.getString(
		R.string.volume_dialog_guest_device_volume_description)
		.equals(ss.remoteLabel))) {
		.equals(ss.remoteLabel)) {
		addRow(
		stream,
		R.drawable.ic_volume_media_bt,

+2 −10

Original line number	Diff line number	Diff line
		@@ -16,10 +16,8 @@

		package com.android.systemui.volume.dagger

		import com.android.settingslib.flags.Flags
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.volume.domain.interactor.AudioSharingInteractor
		import com.android.systemui.volume.domain.interactor.AudioSharingInteractorEmptyImpl
		import com.android.systemui.volume.domain.interactor.AudioSharingInteractorImpl
		import dagger.Lazy
		import dagger.Module
		@@ -33,13 +31,7 @@ interface AudioSharingModule {
		@Provides
		@SysUISingleton
		fun provideAudioSharingInteractor(
		impl: Lazy<AudioSharingInteractorImpl>,
		emptyImpl: Lazy<AudioSharingInteractorEmptyImpl>,
		): AudioSharingInteractor =
		if (Flags.audioSharingDeveloperOption()) {
		impl.get()
		} else {
		emptyImpl.get()
		}
		impl: Lazy<AudioSharingInteractorImpl>
		): AudioSharingInteractor = impl.get()
		}
		}

+1 −5

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.systemui.volume.dialog.sliders.domain.interactor
		import android.content.pm.PackageManager
		import android.media.AudioManager
		import android.media.AudioSystem
		import com.android.settingslib.flags.Flags
		import com.android.systemui.volume.VolumeDialogControllerImpl
		import com.android.systemui.volume.dialog.dagger.scope.VolumeDialog
		import com.android.systemui.volume.dialog.dagger.scope.VolumeDialogScope
		@@ -90,10 +89,7 @@ constructor(
		}

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