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

Commit 1ff29f2d authored by Alan Viverette's avatar Alan Viverette
Browse files

Make ResolverDrawerLayout look like a ScrollView to accessibility 

Disable accessibility focus on the layout itself and expose the class
name as ScrollView so that we can get auto-scroll working until we have
first-class support for specifying automatic scrolling behavior.

Bug: 22667764
Change-Id: I9b97e40f16038046898e5b56b935a61db9073ac6
parent 5d6a2d38

core/java/com/android/internal/widget/ResolverDrawerLayout.java

+24 −4
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.view.ViewParent; 
import android.view.ViewTreeObserver;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityNodeInfo;

import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;

import android.view.animation.AnimationUtils;

import android.widget.AbsListView;

import android.widget.OverScroller;
@@ -609,19 +610,37 @@ public class ResolverDrawerLayout extends ViewGroup { 
    }



    @Override

    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfo(info);

    public CharSequence getAccessibilityClassName() {

        // Since we support scrolling, make this ViewGroup look like a

        // ScrollView. This is kind of a hack until we have support for

        // specifying auto-scroll behavior.

        return android.widget.ScrollView.class.getName();

    }



    @Override

    public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfoInternal(info);



        if (isEnabled()) {

            if (mCollapseOffset != 0) {

                info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);

                info.setScrollable(true);

            }

        }



        // This view should never get accessibility focus, but it's interactive

        // via nested scrolling, so we can't hide it completely.

        info.removeAction(AccessibilityAction.ACTION_ACCESSIBILITY_FOCUS);

    }



    @Override

    public boolean performAccessibilityAction(int action, Bundle arguments) {

        if (super.performAccessibilityAction(action, arguments)) {

    public boolean performAccessibilityActionInternal(int action, Bundle arguments) {

        if (action == AccessibilityAction.ACTION_ACCESSIBILITY_FOCUS.getId()) {

            // This view should never get accessibility focus.

            return false;

        }



        if (super.performAccessibilityActionInternal(action, arguments)) {

            return true;

        }
@@ -629,6 +648,7 @@ public class ResolverDrawerLayout extends ViewGroup { 
            smoothScrollTo(0, 0);

            return true;

        }



        return false;

    }