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

Commit de36f99f authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] Allow adjust volume from icon area" into udc-dev am: 1bcfd4f1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22070702



Change-Id: I0e66350b2ce804eba341a8d8a7f3184d83a3d4cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5cd08667 1bcfd4f1

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

+4 −4
Original line number Diff line number Diff line
@@ -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);

        }