From f957ea74137433cb6871612b996ab26e24bc6071 Mon Sep 17 00:00:00 2001 From: shaoweishen Date: Thu, 10 Feb 2022 13:08:48 +0000 Subject: [PATCH] DO NOT MERGE: Downbranch don't need this adjustment [Output Switcher] Keep the check for single device of add button Test: atest MediaOutputAdapterTest Bug: 192631896 Change-Id: I5030ce21bef9ec37dded3dedff0d6486eef2d8e4 --- .../com/android/systemui/media/dialog/MediaOutputAdapter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java index a82e989f70fc4..e01916f0abe8e 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java @@ -111,7 +111,8 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { } mBottomDivider.setVisibility(View.GONE); mCheckBox.setVisibility(View.GONE); - if (currentlyConnected && mController.isActiveRemoteDevice(device)) { + if (currentlyConnected && mController.isActiveRemoteDevice(device) + && mController.getSelectableMediaDevice().size() > 0) { // Init active device layout mAddIcon.setVisibility(View.VISIBLE); mAddIcon.setTransitionAlpha(1);