Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3020be87 authored by Shaowei Shen's avatar Shaowei Shen Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Downbranch don't need this adjustment [Output Switcher]... 

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

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java

+4 −9
Original line number Diff line number Diff line
@@ -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);

                }

                mTitleIcon.setImageDrawable(getSpeakerDrawable());

                final CharSequence sessionName = mController.getSessionName();

                final CharSequence title = TextUtils.isEmpty(sessionName)