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

Commit 5f84977c authored by shaoweishen's avatar shaoweishen Committed by Automerger Merge Worker
Browse files

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark... 

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected am: 94280acc am: dbf7d03b

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



Change-Id: I8356ad296d7b17b9682cd9d8a89748ebd99c97a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents afd72275 dbf7d03b

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

+1 −4
Original line number Diff line number Diff line
@@ -211,16 +211,13 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                            View.IMPORTANT_FOR_ACCESSIBILITY_YES);

                    setUpContentDescriptionForView(mEndTouchArea, true, device);

                } else if (!mController.hasAdjustVolumeUserRestriction() && currentlyConnected) {

                    mStatusIcon.setImageDrawable(

                            mContext.getDrawable(R.drawable.media_output_status_check));

                    mStatusIcon.setColorFilter(mController.getColorItemContent());

                    mTitleIcon.setImageDrawable(

                            mContext.getDrawable(R.drawable.media_output_icon_volume));

                    mTitleIcon.setColorFilter(mController.getColorItemContent());

                    mTitleText.setTextColor(mController.getColorItemContent());

                    setSingleLineLayout(getItemTitle(device), true /* bFocused */,

                            true /* showSeekBar */,

                            false /* showProgressBar */, true /* showStatus */);

                            false /* showProgressBar */, false /* showStatus */);

                    initSeekbar(device, isCurrentSeekbarInvisible);

                    setUpContentDescriptionForView(mContainerLayout, false, device);

                    mCurrentActivePosition = position;