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

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

Merge "Remove background for the icon area in disabled state." into main

parents 2614124b 3e99e02e

packages/SystemUI/res/layout/media_output_list_item_advanced.xml

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ 
            android:layout_height="64dp"

            android:focusable="false"

            android:importantForAccessibility="no"

            android:background="@drawable/media_output_title_icon_area"

            android:layout_gravity="center_vertical|start">

            <ImageView

                android:id="@+id/title_icon"

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

+0 −2
Original line number Diff line number Diff line
@@ -426,8 +426,6 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            mTitleIcon.setImageDrawable(addDrawable);

            mTitleIcon.setImageTintList(

                    ColorStateList.valueOf(mController.getColorItemContent()));

            mIconAreaLayout.setBackgroundTintList(

                    ColorStateList.valueOf(mController.getColorItemBackground()));

            mContainerLayout.setOnClickListener(mController::launchBluetoothPairing);

        }

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

+2 −11
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ public abstract class MediaOutputBaseAdapter extends 
            mSubTitleText.setSelected(true);

            mTwoLineTitleText.setTextColor(mController.getColorItemContent());

            mVolumeValueText.setTextColor(mController.getColorItemContent());

            mIconAreaLayout.setBackground(null);

            mSeekBar.setProgressTintList(

                    ColorStateList.valueOf(mController.getColorSeekbarProgress()));

        }
@@ -216,10 +217,6 @@ public abstract class MediaOutputBaseAdapter extends 
            mItemLayout.setBackgroundTintList(

                    ColorStateList.valueOf(isActive ? mController.getColorConnectedItemBackground()

                            : mController.getColorItemBackground()));

            mIconAreaLayout.setBackgroundTintList(

                    ColorStateList.valueOf(showSeekBar ? mController.getColorSeekbarProgress()

                            : showProgressBar ? mController.getColorConnectedItemBackground()

                                    : mController.getColorItemBackground()));

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

            mSeekBar.setAlpha(1);

            mSeekBar.setVisibility(showSeekBar ? View.VISIBLE : View.GONE);
@@ -259,11 +256,6 @@ public abstract class MediaOutputBaseAdapter extends 
                    showSeekBar || isFakeActive ? mController.getColorConnectedItemBackground()

                            : mController.getColorItemBackground()

            ));

            mIconAreaLayout.setBackgroundTintList(

                    ColorStateList.valueOf(showProgressBar || isFakeActive

                            ? mController.getColorConnectedItemBackground()

                            : showSeekBar ? mController.getColorSeekbarProgress()

                                    : mController.getColorItemBackground()));

            if (showSeekBar) {

                updateSeekbarProgressBackground();

            }
@@ -443,8 +435,7 @@ public abstract class MediaOutputBaseAdapter extends 
            mItemLayout.setBackground(backgroundDrawable);

            mItemLayout.setBackgroundTintList(

                    ColorStateList.valueOf(mController.getColorConnectedItemBackground()));

            mIconAreaLayout.setBackgroundTintList(

                    ColorStateList.valueOf(mController.getColorConnectedItemBackground()));

            mIconAreaLayout.setBackground(null);

        }



        private void initAnimator() {