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

Commit 73baa5e1 authored by Alex Shabalin's avatar Alex Shabalin
Browse files

Don't override AccessibilityDelegate for any views. 

This overridden AccessibilityDelegate simply removed the clickListener
for an associated view whenever a11y technology is enabled. It was
called for `mSeekBar` and `mEndTouchArea` views.
- For `mSeekBar` it was a no-op since a SeekBar doesn't have a click
listener anyway, however it lead to bug when using Switch Access
described in b/374869964.
- For `mEndTouchArea` it actually broke the click action because it
removed the clickListener that was set before. That led to inability to
add or remove group devices with Talkback.

Flag: EXEMPT bugfix
Bug: 374869964
Test: locally on a physical device.
Change-Id: I36468dd15757103fe034ce1fe833b1c6f5f49f57
parent f5b4905f

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

    }

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

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

                }

            });

        }

    }