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

Commit 7f374f39 authored by Bishoy Gendy's avatar Bishoy Gendy Committed by Automerger Merge Worker
Browse files

Merge "Remove SysUI flag for enabling output switcher api" into tm-qpr-dev am:... 

Merge "Remove SysUI flag for enabling output switcher api" into tm-qpr-dev am: 43e1ee6b am: bb3f41ae

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21611512



Change-Id: I66bc0b2907d4b3c2ba3735ae8b251c494e5cedf4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7bb13fb bb3f41ae

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

+0 −5
Original line number Diff line number Diff line
@@ -625,11 +625,6 @@ object Flags { 
    @JvmField

    val OUTPUT_SWITCHER_DEVICE_STATUS = releasedFlag(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

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputSwitcherDialogUI.java

+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