diff options
3 files changed, 2 insertions, 14 deletions
diff --git a/packages/SystemUI/res/layout/media_output_list_item_advanced.xml b/packages/SystemUI/res/layout/media_output_list_item_advanced.xml index 21e0d2c0b8d7..f943f8660d65 100644 --- a/packages/SystemUI/res/layout/media_output_list_item_advanced.xml +++ b/packages/SystemUI/res/layout/media_output_list_item_advanced.xml @@ -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" diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java index 0ada931aea43..171ac69fe766 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java @@ -427,8 +427,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); } diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java index 1a2238cfbc9e..f552987e78e1 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java @@ -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() { |