Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Downbranch don't need this adjustment [Output Switcher] Keep showing the add button" into sc-v2-dev

Browse Source
This commit is contained in:
Shaowei Shen
2022-02-09 13:19:33 +00:00
committed by Android (Google) Code Review
parent 1b6154a3f9 dc84c1907d
commit 3020be87a7
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java
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)