Merge "Remove SysUI flag for enabling output switcher api" into tm-qpr-dev (43e1ee6b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −5

Original line number	Diff line number	Diff line
		@@ -639,11 +639,6 @@ object Flags {
		@JvmField
		val OUTPUT_SWITCHER_DEVICE_STATUS = unreleasedFlag(2502, "output_switcher_device_status")

		// TODO(b/20911786): Tracking Bug
		@JvmField
		val OUTPUT_SWITCHER_SHOW_API_ENABLED =
		releasedFlag(2503, "output_switcher_show_api_enabled", teamfood = true)

		// 2700 - unfold transitions
		// TODO(b/265764985): Tracking Bug
		@Keep

+2 −11

Original line number	Diff line number	Diff line
		@@ -23,8 +23,6 @@ import android.util.Log;

		import com.android.systemui.CoreStartable;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.statusbar.CommandQueue;

		import javax.inject.Inject;
		@@ -37,26 +35,19 @@ public class MediaOutputSwitcherDialogUI implements CoreStartable, CommandQueue.

		private final CommandQueue mCommandQueue;
		private final MediaOutputDialogFactory mMediaOutputDialogFactory;
		private final FeatureFlags mFeatureFlags;

		@Inject
		public MediaOutputSwitcherDialogUI(
		Context context,
		CommandQueue commandQueue,
		MediaOutputDialogFactory mediaOutputDialogFactory,
		FeatureFlags featureFlags) {
		MediaOutputDialogFactory mediaOutputDialogFactory) {
		mCommandQueue = commandQueue;
		mMediaOutputDialogFactory = mediaOutputDialogFactory;
		mFeatureFlags = featureFlags;
		}

		@Override
		public void start() {
		if (mFeatureFlags.isEnabled(Flags.OUTPUT_SWITCHER_SHOW_API_ENABLED)) {
		mCommandQueue.addCallback(this);
		} else {
		Log.w(TAG, "Show media output switcher is not enabled.");
		}
		}

		@Override