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] [A11y] Set property for endTouchArea" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-30 10:06:37 +00:00
committed by Android (Google) Code Review
parent ddcd8e5e7f be6b577f27
commit 2291da765c
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/media_output_list_item.xml
View File

@@ -129,6 +129,8 @@
android:gravity="center_vertical"> android:gravity="center_vertical">
<CheckBox <CheckBox
android:id="@+id/check_box" android:id="@+id/check_box"
android:focusable="false"
android:importantForAccessibility="no"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"

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

@@ -118,6 +118,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
mCheckBox.setVisibility(View.GONE); mCheckBox.setVisibility(View.GONE);
mStatusIcon.setVisibility(View.GONE); mStatusIcon.setVisibility(View.GONE);
mEndTouchArea.setVisibility(View.GONE); mEndTouchArea.setVisibility(View.GONE);
mEndTouchArea.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
mContainerLayout.setOnClickListener(null); mContainerLayout.setOnClickListener(null);
mContainerLayout.setContentDescription(null); mContainerLayout.setContentDescription(null);
mTitleText.setTextColor(mController.getColorItemContent()); mTitleText.setTextColor(mController.getColorItemContent());
@@ -170,7 +171,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 */);
setUpContentDescriptionForActiveDevice(device); setUpContentDescriptionForView(mContainerLayout, false, device);
mCheckBox.setOnCheckedChangeListener(null); mCheckBox.setOnCheckedChangeListener(null);
mCheckBox.setVisibility(View.VISIBLE); mCheckBox.setVisibility(View.VISIBLE);
mCheckBox.setChecked(true); mCheckBox.setChecked(true);
@@ -181,6 +182,9 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
mEndTouchArea.setVisibility(View.VISIBLE); mEndTouchArea.setVisibility(View.VISIBLE);
mEndTouchArea.setOnClickListener(null); mEndTouchArea.setOnClickListener(null);
mEndTouchArea.setOnClickListener((v) -> mCheckBox.performClick()); mEndTouchArea.setOnClickListener((v) -> mCheckBox.performClick());
mEndTouchArea.setImportantForAccessibility(
View.IMPORTANT_FOR_ACCESSIBILITY_YES);
setUpContentDescriptionForView(mEndTouchArea, true, device);
} else if (!mController.hasAdjustVolumeUserRestriction() && currentlyConnected) { } else if (!mController.hasAdjustVolumeUserRestriction() && currentlyConnected) {
mStatusIcon.setImageDrawable( mStatusIcon.setImageDrawable(
mContext.getDrawable(R.drawable.media_output_status_check)); mContext.getDrawable(R.drawable.media_output_status_check));
@@ -190,7 +194,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
true /* showSeekBar */, true /* showSeekBar */,
false /* showProgressBar */, true /* showStatus */); false /* showProgressBar */, true /* showStatus */);
initSeekbar(device); initSeekbar(device);
setUpContentDescriptionForActiveDevice(device); setUpContentDescriptionForView(mContainerLayout, false, device);
mCurrentActivePosition = position; mCurrentActivePosition = position;
} else if (isDeviceIncluded(mController.getSelectableMediaDevice(), device)) { } else if (isDeviceIncluded(mController.getSelectableMediaDevice(), device)) {
mCheckBox.setOnCheckedChangeListener(null); mCheckBox.setOnCheckedChangeListener(null);
@@ -258,9 +262,10 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
} }
} }
private void setUpContentDescriptionForActiveDevice(MediaDevice device) { private void setUpContentDescriptionForView(View view, boolean clickable,
mContainerLayout.setClickable(false); MediaDevice device) {
mContainerLayout.setContentDescription( view.setClickable(clickable);
view.setContentDescription(
mContext.getString(device.getDeviceType() mContext.getString(device.getDeviceType()
== MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE == MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE
? R.string.accessibility_bluetooth_name ? R.string.accessibility_bluetooth_name