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

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

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

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev
parents 89c33258 94280acc

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;