Merge changes from topic "presubmit-am-86e91cffbb564d20a27cb55011174a08" into sc-v2-dev-plus-aosp

* changes:
  [automerge] DO NOT MERGE: Downbranch don't need this adjustment [Output Switcher] Keep the check for single device of add button 2p: f957ea7413
  DO NOT MERGE: Downbranch don't need this adjustment [Output Switcher] Keep the check for single device of add button
This commit is contained in:
Shaowei Shen
2022-02-16 11:39:17 +00:00
committed by Android (Google) Code Review

View File

@@ -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);