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

Commit 90bad16d authored by Alexandr Shabalin's avatar Alexandr Shabalin Committed by Android (Google) Code Review
Browse files

Merge "Use single layout for both 1- and 2-line device item UI." into main

parents 4a7923a9 5e3fd539

packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java

+16 −41
Original line number Diff line number Diff line
@@ -156,11 +156,10 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 2);



        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTitleText.getText()).isEqualTo(mContext.getText(

                R.string.media_output_dialog_pairing_new));

        assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(

                mContext.getText(R.string.media_output_dialog_pairing_new).toString());

    }



    @Test
@@ -179,7 +178,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);



        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.VISIBLE);
@@ -201,7 +199,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);



        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.VISIBLE);
@@ -216,7 +213,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);

    }
@@ -232,7 +228,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);

    }
@@ -250,7 +245,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mEndTouchArea.getVisibility()).isEqualTo(View.VISIBLE);

    }
@@ -281,7 +275,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mEndTouchArea.getVisibility()).isEqualTo(View.GONE);

    }
@@ -301,7 +294,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mEndTouchArea.getVisibility()).isEqualTo(View.VISIBLE);

    }
@@ -323,7 +315,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mEndTouchArea.getVisibility()).isEqualTo(View.VISIBLE);

    }
@@ -334,7 +325,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaSwitchingController.isCurrentConnectedDeviceRemote()).thenReturn(false);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);



        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);
@@ -350,7 +340,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);



        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);
@@ -392,7 +381,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaSwitchingController.getSelectableMediaDevice()).thenReturn(selectableDevices);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 1);



        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);
@@ -404,7 +392,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
    public void onBindViewHolder_bindNonActiveConnectedDevice_verifyView() {

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 1);



        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);
@@ -422,7 +409,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(

                TEST_DEVICE_NAME_2);

        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

    }



    @Test
@@ -431,15 +417,14 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
                LocalMediaManager.MediaDeviceState.STATE_CONNECTING_FAILED);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 1);



        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(TEST_DEVICE_NAME_2);

        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTwoLineTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mSubTitleText.getText()).isEqualTo(mContext.getText(

                R.string.media_output_dialog_connect_failed));

        assertThat(mViewHolder.mTwoLineTitleText.getText()).isEqualTo(TEST_DEVICE_NAME_2);

        assertThat(mViewHolder.mSubTitleText.getText().toString()).isEqualTo(

                mContext.getText(R.string.media_output_dialog_connect_failed).toString());

    }



    @Test
@@ -455,17 +440,15 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);



        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(TEST_DEVICE_NAME_1);

        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mEndClickIcon.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mStatusIcon.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTwoLineTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mSubTitleText.getText().toString()).isEqualTo(TEST_CUSTOM_SUBTEXT);

        assertThat(mViewHolder.mTwoLineTitleText.getText().toString()).isEqualTo(

                TEST_DEVICE_NAME_1);

        assertThat(mViewHolder.mContainerLayout.hasOnClickListeners()).isFalse();

    }
@@ -481,15 +464,14 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 1);



        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(TEST_DEVICE_NAME_2);

        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mStatusIcon.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTwoLineTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mSubTitleText.getText()).isEqualTo(deviceStatus);

        assertThat(mViewHolder.mTwoLineTitleText.getText()).isEqualTo(TEST_DEVICE_NAME_2);

        assertThat(mViewHolder.mSubTitleText.getText().toString()).isEqualTo(deviceStatus);

        assertThat(mViewHolder.mContainerLayout.hasOnClickListeners()).isTrue();

    }
@@ -505,16 +487,14 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 1);



        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(TEST_DEVICE_NAME_2);

        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mStatusIcon.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTwoLineTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mSubTitleText.getText().toString()).isEqualTo(deviceStatus);

        assertThat(mViewHolder.mTwoLineTitleText.getText().toString()).isEqualTo(

                TEST_DEVICE_NAME_2);

        assertThat(mViewHolder.mContainerLayout.hasOnClickListeners()).isFalse();

    }
@@ -529,16 +509,14 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);



        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(TEST_DEVICE_NAME_1);

        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mStatusIcon.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTwoLineTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mSubTitleText.getText().toString()).isEqualTo(TEST_CUSTOM_SUBTEXT);

        assertThat(mViewHolder.mTwoLineTitleText.getText().toString()).isEqualTo(

                TEST_DEVICE_NAME_1);

        assertThat(mViewHolder.mContainerLayout.hasOnClickListeners()).isFalse();

    }
@@ -555,7 +533,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

    }



    @Test
@@ -571,7 +548,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

    }



    @Test
@@ -581,11 +557,10 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
                LocalMediaManager.MediaDeviceState.STATE_CONNECTING);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);



        assertThat(mViewHolder.mTwoLineLayout.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTitleText.getText()).isEqualTo(TEST_DEVICE_NAME_1);

        assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(TEST_DEVICE_NAME_1);

    }



    @Test

packages/SystemUI/res/layout/media_output_list_item_advanced.xml

+3 −16
Original line number Diff line number Diff line
@@ -74,30 +74,17 @@ 
                android:visibility="gone"/>

        </FrameLayout>



        <TextView

            android:id="@+id/title"

            android:focusable="false"

            android:importantForAccessibility="no"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical|start"

            android:layout_marginStart="72dp"

            android:layout_marginEnd="56dp"

            android:ellipsize="end"

            android:maxLines="1"

            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

            android:textSize="16sp"/>



        <LinearLayout

            android:id="@+id/two_line_layout"

            android:orientation="vertical"

            android:layout_width="wrap_content"

            android:layout_gravity="center_vertical|start"

            android:gravity="center_vertical|start"

            android:layout_height="48dp"

            android:layout_marginEnd="56dp"

            android:layout_marginStart="72dp">

            <TextView

                android:id="@+id/two_line_title"

                android:id="@+id/title"

                android:importantForAccessibility="no"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:ellipsize="end"

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

+5 −11
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                        mCurrentActivePosition = position;

                        updateUnmutedVolumeIcon(device);

                        mSubTitleText.setText(device.getSubtextString());

                        updateTwoLineLayoutContentAlpha(DEVICE_CONNECTED_ALPHA);

                        updateContentAlpha(DEVICE_CONNECTED_ALPHA);

                        updateEndClickAreaAsSessionEditing(device,

                                isHost ? R.drawable.media_output_status_edit_session

                                        : R.drawable.ic_sound_bars_anim);
@@ -210,7 +210,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                        if (deviceStatusIcon != null) {

                            updateDeviceStatusIcon(deviceStatusIcon);

                        }

                        updateTwoLineLayoutContentAlpha(

                        updateContentAlpha(

                                updateClickActionBasedOnSelectionBehavior(device)

                                        ? DEVICE_CONNECTED_ALPHA : DEVICE_DISCONNECTED_ALPHA);

                        setTwoLineLayout(device.getName(),
@@ -313,7 +313,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                        updateDeviceStatusIcon(deviceStatusIcon);

                        mStatusIcon.setVisibility(View.VISIBLE);

                    }

                    updateSingleLineLayoutContentAlpha(

                    updateContentAlpha(

                            updateClickActionBasedOnSelectionBehavior(device)

                                    ? DEVICE_CONNECTED_ALPHA : DEVICE_DISCONNECTED_ALPHA);

                }
@@ -327,16 +327,10 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                    ColorStateList(states, colors));

        }



        private void updateTwoLineLayoutContentAlpha(float alphaValue) {

            mSubTitleText.setAlpha(alphaValue);

            mTitleIcon.setAlpha(alphaValue);

            mTwoLineTitleText.setAlpha(alphaValue);

            mStatusIcon.setAlpha(alphaValue);

        }



        private void updateSingleLineLayoutContentAlpha(float alphaValue) {

        private void updateContentAlpha(float alphaValue) {

            mTitleIcon.setAlpha(alphaValue);

            mTitleText.setAlpha(alphaValue);

            mSubTitleText.setAlpha(alphaValue);

            mStatusIcon.setAlpha(alphaValue);

        }

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

+1 −12
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.view.animation.LinearInterpolator; 
import android.widget.CheckBox;

import android.widget.FrameLayout;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.ProgressBar;

import android.widget.SeekBar;

import android.widget.TextView;
@@ -133,12 +132,10 @@ public abstract class MediaOutputBaseAdapter extends 
        final FrameLayout mItemLayout;

        final FrameLayout mIconAreaLayout;

        final TextView mTitleText;

        final TextView mTwoLineTitleText;

        final TextView mSubTitleText;

        final TextView mVolumeValueText;

        final ImageView mTitleIcon;

        final ProgressBar mProgressBar;

        final LinearLayout mTwoLineLayout;

        final ImageView mStatusIcon;

        final CheckBox mCheckBox;

        final ViewGroup mEndTouchArea;
@@ -156,8 +153,6 @@ public abstract class MediaOutputBaseAdapter extends 
            mItemLayout = view.requireViewById(R.id.item_layout);

            mTitleText = view.requireViewById(R.id.title);

            mSubTitleText = view.requireViewById(R.id.subtitle);

            mTwoLineLayout = view.requireViewById(R.id.two_line_layout);

            mTwoLineTitleText = view.requireViewById(R.id.two_line_title);

            mTitleIcon = view.requireViewById(R.id.title_icon);

            mProgressBar = view.requireViewById(R.id.volume_indeterminate_progress);

            mSeekBar = view.requireViewById(R.id.volume_seekbar);
@@ -180,8 +175,6 @@ public abstract class MediaOutputBaseAdapter extends 
            mContainerLayout.setContentDescription(null);

            mTitleText.setTextColor(mController.getColorItemContent());

            mSubTitleText.setTextColor(mController.getColorItemContent());

            mSubTitleText.setSelected(true);

            mTwoLineTitleText.setTextColor(mController.getColorItemContent());

            mVolumeValueText.setTextColor(mController.getColorItemContent());

            mIconAreaLayout.setBackground(null);

            mSeekBar.setProgressTintList(
@@ -194,7 +187,6 @@ public abstract class MediaOutputBaseAdapter extends 


        void setSingleLineLayout(CharSequence title, boolean showSeekBar,

                boolean showProgressBar, boolean showCheckBox, boolean showEndTouchArea) {

            mTwoLineLayout.setVisibility(View.GONE);

            boolean isActive = showSeekBar || showProgressBar;

            if (!mCornerAnimator.isRunning()) {

                final Drawable backgroundDrawable =
@@ -219,7 +211,6 @@ public abstract class MediaOutputBaseAdapter extends 
                mSeekBar.resetVolume();

            }

            mTitleText.setText(title);

            mTitleText.setVisibility(View.VISIBLE);

            mCheckBox.setVisibility(showCheckBox ? View.VISIBLE : View.GONE);

            mEndTouchArea.setVisibility(showEndTouchArea ? View.VISIBLE : View.GONE);

            ViewGroup.MarginLayoutParams params =
@@ -236,8 +227,6 @@ public abstract class MediaOutputBaseAdapter extends 
        void setTwoLineLayout(CharSequence title,

                boolean showSeekBar, boolean showProgressBar, boolean showSubtitle,

                boolean showStatus , boolean showEndTouchArea) {

            mTitleText.setVisibility(View.GONE);

            mTwoLineLayout.setVisibility(View.VISIBLE);

            mStatusIcon.setVisibility(showStatus ? View.VISIBLE : View.GONE);

            mSeekBar.setAlpha(1);

            mSeekBar.setVisibility(showSeekBar ? View.VISIBLE : View.GONE);
@@ -262,7 +251,7 @@ public abstract class MediaOutputBaseAdapter extends 
            mItemLayout.setBackground(backgroundDrawable);

            mProgressBar.setVisibility(showProgressBar ? View.VISIBLE : View.GONE);

            mSubTitleText.setVisibility(showSubtitle ? View.VISIBLE : View.GONE);

            mTwoLineTitleText.setText(title);

            mTitleText.setText(title);

        }



        void updateSeekbarProgressBackground() {