From 06d907f097fc4ec182262fbff544c74e64996bf6 Mon Sep 17 00:00:00 2001 From: shaoweishen Date: Tue, 14 Mar 2023 13:02:40 +0000 Subject: [PATCH] [Output Switcher] Allow adjust volume from icon area dispatch touch event to seekbar to allow adjust volume from icon area Bug: 265756927 Test: atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest Change-Id: I79a9d32240ddc48748882bf0842177318d6687a4 --- .../systemui/media/dialog/MediaOutputBaseAdapter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 f76f049abf97e..f92a5abdbf23b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java @@ -192,8 +192,11 @@ public abstract class MediaOutputBaseAdapter extends mSubTitleText.setTextColor(mController.getColorItemContent()); mTwoLineTitleText.setTextColor(mController.getColorItemContent()); if (mController.isAdvancedLayoutSupported()) { - mIconAreaLayout.setOnClickListener(null); mVolumeValueText.setTextColor(mController.getColorItemContent()); + mTitleIcon.setOnTouchListener(((v, event) -> { + mSeekBar.dispatchTouchEvent(event); + return false; + })); } mSeekBar.setProgressTintList( ColorStateList.valueOf(mController.getColorSeekbarProgress())); @@ -444,9 +447,6 @@ public abstract class MediaOutputBaseAdapter extends } void updateIconAreaClickListener(View.OnClickListener listener) { - if (mController.isAdvancedLayoutSupported()) { - mIconAreaLayout.setOnClickListener(listener); - } mTitleIcon.setOnClickListener(listener); }