From dc84c1907d44c33377959a51034d23f2e9026a5c Mon Sep 17 00:00:00 2001 From: shaoweishen Date: Mon, 17 Jan 2022 14:19:47 +0000 Subject: [PATCH] DO NOT MERGE: Downbranch don't need this adjustment [Output Switcher] Keep showing the add button regardless selectable devices size, always show add button to allow user to launch and edit group. Test: verified on device Bug: 192631896 Change-Id: Ibbf639bf08e4260e0a4eae54dd78f0e4b238a4a4 --- .../systemui/media/dialog/MediaOutputAdapter.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) 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 113ba59cd5143..382f2956068d1 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java @@ -111,8 +111,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { } mBottomDivider.setVisibility(View.GONE); mCheckBox.setVisibility(View.GONE); - if (currentlyConnected && mController.isActiveRemoteDevice(device) - && mController.getSelectableMediaDevice().size() > 0) { + if (currentlyConnected && mController.isActiveRemoteDevice(device)) { // Init active device layout mAddIcon.setVisibility(View.VISIBLE); mAddIcon.setTransitionAlpha(1); @@ -177,13 +176,9 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { mConnectedItem = mContainerLayout; mBottomDivider.setVisibility(View.GONE); mCheckBox.setVisibility(View.GONE); - if (mController.getSelectableMediaDevice().size() > 0) { - mAddIcon.setVisibility(View.VISIBLE); - mAddIcon.setTransitionAlpha(1); - mAddIcon.setOnClickListener(this::onEndItemClick); - } else { - mAddIcon.setVisibility(View.GONE); - } + mAddIcon.setVisibility(View.VISIBLE); + mAddIcon.setTransitionAlpha(1); + mAddIcon.setOnClickListener(this::onEndItemClick); mTitleIcon.setImageDrawable(getSpeakerDrawable()); final CharSequence sessionName = mController.getSessionName(); final CharSequence title = TextUtils.isEmpty(sessionName)