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] Update property for A11y bugs" into tm-dev

Browse Source
This commit is contained in:
Shaowei Shen
2022-04-19 01:39:38 +00:00
committed by Android (Google) Code Review
parent 5b19566d7a 529a007902
commit 44b000a225
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,6 +119,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
mStatusIcon.setVisibility(View.GONE);
mEndTouchArea.setVisibility(View.GONE);
mContainerLayout.setOnClickListener(null);
mContainerLayout.setContentDescription(null);
mTitleText.setTextColor(mController.getColorItemContent());
mSubTitleText.setTextColor(mController.getColorItemContent());
mTwoLineTitleText.setTextColor(mController.getColorItemContent());
@@ -169,6 +170,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
setSingleLineLayout(getItemTitle(device), true /* bFocused */,
true /* showSeekBar */,
false /* showProgressBar */, false /* showStatus */);
setUpContentDescriptionForActiveDevice(device);
mCheckBox.setOnCheckedChangeListener(null);
mCheckBox.setVisibility(View.VISIBLE);
mCheckBox.setChecked(true);
@@ -188,6 +190,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
true /* showSeekBar */,
false /* showProgressBar */, true /* showStatus */);
initSeekbar(device);
setUpContentDescriptionForActiveDevice(device);
mCurrentActivePosition = position;
} else if (isDeviceIncluded(mController.getSelectableMediaDevice(), device)) {
mCheckBox.setOnCheckedChangeListener(null);
@@ -254,5 +257,14 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
notifyDataSetChanged();
}
}
private void setUpContentDescriptionForActiveDevice(MediaDevice device) {
mContainerLayout.setClickable(false);
mContainerLayout.setContentDescription(
mContext.getString(device.getDeviceType()
== MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE
? R.string.accessibility_bluetooth_name
: R.string.accessibility_cast_name, device.getName()));
}
}
}