Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bishoy Gendy
2023-03-01 17:40:10 +00:00
committed by Android (Google) Code Review
parent e58ae09446 367406b615
commit 43e1ee6b32
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -639,11 +639,6 @@ object Flags {
@JvmField @JvmField
val OUTPUT_SWITCHER_DEVICE_STATUS = unreleasedFlag(2502, "output_switcher_device_status") 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 // 2700 - unfold transitions
// TODO(b/265764985): Tracking Bug // TODO(b/265764985): Tracking Bug
@Keep @Keep

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

@@ -23,8 +23,6 @@ import android.util.Log;
import com.android.systemui.CoreStartable; import com.android.systemui.CoreStartable;
import com.android.systemui.dagger.SysUISingleton; 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 com.android.systemui.statusbar.CommandQueue;
import javax.inject.Inject; import javax.inject.Inject;
@@ -37,26 +35,19 @@ public class MediaOutputSwitcherDialogUI implements CoreStartable, CommandQueue.
private final CommandQueue mCommandQueue; private final CommandQueue mCommandQueue;
private final MediaOutputDialogFactory mMediaOutputDialogFactory; private final MediaOutputDialogFactory mMediaOutputDialogFactory;
private final FeatureFlags mFeatureFlags;
@Inject @Inject
public MediaOutputSwitcherDialogUI( public MediaOutputSwitcherDialogUI(
Context context, Context context,
CommandQueue commandQueue, CommandQueue commandQueue,
MediaOutputDialogFactory mediaOutputDialogFactory, MediaOutputDialogFactory mediaOutputDialogFactory) {
FeatureFlags featureFlags) {
mCommandQueue = commandQueue; mCommandQueue = commandQueue;
mMediaOutputDialogFactory = mediaOutputDialogFactory; mMediaOutputDialogFactory = mediaOutputDialogFactory;
mFeatureFlags = featureFlags;
} }
@Override @Override
public void start() { public void start() {
if (mFeatureFlags.isEnabled(Flags.OUTPUT_SWITCHER_SHOW_API_ENABLED)) {
mCommandQueue.addCallback(this); mCommandQueue.addCallback(this);
} else {
Log.w(TAG, "Show media output switcher is not enabled.");
}
} }
@Override @Override