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
This commit is contained in:
committed by
Shaowei Shen
parent
99f9addc90
commit
dc84c1907d
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user