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

Commit 36b0757a authored by shaoweishen's avatar shaoweishen Committed by Automerger Merge Worker
Browse files

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make checkbox... 

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make checkbox disable if a device is not deselectable am: ec0d7f51

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



Change-Id: I1d0add56d47a98828d63c83ac46a734e6eb864e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 394b008a ec0d7f51

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

+12 −3
Original line number Original line Diff line number Diff line
@@ -176,6 +176,8 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                            true /* showProgressBar */, false /* showStatus */);

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

                } else if (mController.getSelectedMediaDevice().size() > 1

                } else if (mController.getSelectedMediaDevice().size() > 1

                        && isDeviceIncluded(mController.getSelectedMediaDevice(), device)) {

                        && isDeviceIncluded(mController.getSelectedMediaDevice(), device)) {

                    boolean isDeviceDeselectable = isDeviceIncluded(

                            mController.getDeselectableMediaDevice(), device);

                    mTitleText.setTextColor(mController.getColorItemContent());

                    mTitleText.setTextColor(mController.getColorItemContent());

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

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

                            true /* showSeekBar */,

                            true /* showSeekBar */,
@@ -184,13 +186,20 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                    mCheckBox.setOnCheckedChangeListener(null);

                    mCheckBox.setOnCheckedChangeListener(null);

                    mCheckBox.setVisibility(View.VISIBLE);

                    mCheckBox.setVisibility(View.VISIBLE);

                    mCheckBox.setChecked(true);

                    mCheckBox.setChecked(true);

                    mCheckBox.setOnCheckedChangeListener(

                    mCheckBox.setOnCheckedChangeListener(isDeviceDeselectable

                            (buttonView, isChecked) -> onGroupActionTriggered(false, device));

                            ? (buttonView, isChecked) -> onGroupActionTriggered(false, device)

                            : null);

                    mCheckBox.setEnabled(isDeviceDeselectable);

                    mCheckBox.setAlpha(

                            isDeviceDeselectable ? DEVICE_CONNECTED_ALPHA

                                    : DEVICE_DISCONNECTED_ALPHA

                    );

                    setCheckBoxColor(mCheckBox, mController.getColorItemContent());

                    setCheckBoxColor(mCheckBox, mController.getColorItemContent());

                    initSeekbar(device, isCurrentSeekbarInvisible);

                    initSeekbar(device, isCurrentSeekbarInvisible);

                    mEndTouchArea.setVisibility(View.VISIBLE);

                    mEndTouchArea.setVisibility(View.VISIBLE);

                    mEndTouchArea.setOnClickListener(null);

                    mEndTouchArea.setOnClickListener(null);

                    mEndTouchArea.setOnClickListener((v) -> mCheckBox.performClick());

                    mEndTouchArea.setOnClickListener(

                            isDeviceDeselectable ? (v) -> mCheckBox.performClick() : null);

                    mEndTouchArea.setImportantForAccessibility(

                    mEndTouchArea.setImportantForAccessibility(

                            View.IMPORTANT_FOR_ACCESSIBILITY_YES);

                            View.IMPORTANT_FOR_ACCESSIBILITY_YES);

                    setUpContentDescriptionForView(mEndTouchArea, true, device);

                    setUpContentDescriptionForView(mEndTouchArea, true, device);