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

Commit 9f8dd75e authored by Shaowei Shen's avatar Shaowei Shen Committed by Android (Google) Code Review
Browse files

Merge "[Output Switcher] Clear listener of checkbox when about to set it."

parents c59b299b a48aa965

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -103,6 +103,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            }

            }

            mCheckBox.setVisibility(View.GONE);

            mCheckBox.setVisibility(View.GONE);

            mStatusIcon.setVisibility(View.GONE);

            mStatusIcon.setVisibility(View.GONE);

            mContainerLayout.setOnClickListener(null);

            mTitleText.setTextColor(mController.getColorInactiveItem());

            mTitleText.setTextColor(mController.getColorInactiveItem());

            mSeekBar.getProgressDrawable().setColorFilter(

            mSeekBar.getProgressDrawable().setColorFilter(

                    new PorterDuffColorFilter(mController.getColorSeekbarProgress(),

                    new PorterDuffColorFilter(mController.getColorSeekbarProgress(),
@@ -151,6 +152,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                    setSingleLineLayout(getItemTitle(device), true /* bFocused */,

                    setSingleLineLayout(getItemTitle(device), true /* bFocused */,

                            true /* showSeekBar */,

                            true /* showSeekBar */,

                            false /* showProgressBar */, false /* showStatus */);

                            false /* showProgressBar */, false /* showStatus */);

                    mCheckBox.setOnCheckedChangeListener(null);

                    mCheckBox.setVisibility(View.VISIBLE);

                    mCheckBox.setVisibility(View.VISIBLE);

                    mCheckBox.setChecked(true);

                    mCheckBox.setChecked(true);

                    mCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {

                    mCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
@@ -169,6 +171,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                    initSeekbar(device);

                    initSeekbar(device);

                    mCurrentActivePosition = position;

                    mCurrentActivePosition = position;

                } else if (isDeviceIncluded(mController.getSelectableMediaDevice(), device)) {

                } else if (isDeviceIncluded(mController.getSelectableMediaDevice(), device)) {

                    mCheckBox.setOnCheckedChangeListener(null);

                    mCheckBox.setVisibility(View.VISIBLE);

                    mCheckBox.setVisibility(View.VISIBLE);

                    mCheckBox.setChecked(false);

                    mCheckBox.setChecked(false);

                    mCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {

                    mCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {