Merge "Don't override AccessibilityDelegate for any views." into main (2614124b) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -265,7 +265,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase {
		mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);

		assertThat(mViewHolder.mSeekBar.getContentDescription()).isNotNull();
		assertThat(mViewHolder.mSeekBar.getAccessibilityDelegate()).isNotNull();
		assertThat(mViewHolder.mContainerLayout.isFocusable()).isFalse();
		}

+0 −8

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.graphics.drawable.Drawable;
		import android.util.Log;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.accessibility.AccessibilityNodeInfo;
		import android.widget.CheckBox;
		import android.widget.TextView;

		@@ -494,13 +493,6 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
		== MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE
		? R.string.accessibility_bluetooth_name
		: R.string.accessibility_cast_name, device.getName()));
		view.setAccessibilityDelegate(new View.AccessibilityDelegate() {
		public void onInitializeAccessibilityNodeInfo(View host,
		AccessibilityNodeInfo info) {
		super.onInitializeAccessibilityNodeInfo(host, info);
		host.setOnClickListener(null);
		}
		});
		}
		}