Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make checkbox disable if a device is not deselectable" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-09 15:10:00 +00:00
committed by Android (Google) Code Review
parent 7742f48683 ec0d7f51e5
commit 4fccafd334
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);