DO NOT MERGE: Downbranch don't need this adjustment am: dc84c1907d

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

Change-Id: I6cc18bee29a289085834e439938452ff7184d553
This commit is contained in:
shaoweishen
2022-02-09 13:32:02 +00:00
committed by Automerger Merge Worker

View File

@@ -111,8 +111,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
} }
mBottomDivider.setVisibility(View.GONE); mBottomDivider.setVisibility(View.GONE);
mCheckBox.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 // Init active device layout
mAddIcon.setVisibility(View.VISIBLE); mAddIcon.setVisibility(View.VISIBLE);
mAddIcon.setTransitionAlpha(1); mAddIcon.setTransitionAlpha(1);
@@ -177,13 +176,9 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
mConnectedItem = mContainerLayout; mConnectedItem = mContainerLayout;
mBottomDivider.setVisibility(View.GONE); mBottomDivider.setVisibility(View.GONE);
mCheckBox.setVisibility(View.GONE); mCheckBox.setVisibility(View.GONE);
if (mController.getSelectableMediaDevice().size() > 0) { mAddIcon.setVisibility(View.VISIBLE);
mAddIcon.setVisibility(View.VISIBLE); mAddIcon.setTransitionAlpha(1);
mAddIcon.setTransitionAlpha(1); mAddIcon.setOnClickListener(this::onEndItemClick);
mAddIcon.setOnClickListener(this::onEndItemClick);
} else {
mAddIcon.setVisibility(View.GONE);
}
mTitleIcon.setImageDrawable(getSpeakerDrawable()); mTitleIcon.setImageDrawable(getSpeakerDrawable());
final CharSequence sessionName = mController.getSessionName(); final CharSequence sessionName = mController.getSessionName();
final CharSequence title = TextUtils.isEmpty(sessionName) final CharSequence title = TextUtils.isEmpty(sessionName)