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

Commit 9cf48483 authored by yingleiw's avatar yingleiw
Browse files

Add directional accessibility scroll actions to ResolverDrawerLayout 

Also added action expand/collapse/dismiss.

Test: tested with twisted talkback and the chooser menu (select "send a
copy" for one item in google drive) that scroll down has the same effect
as scroll forward (expand the menu). Also tested the other added
commands.
Bug: 136277517
Change-Id: I5447603e6bc8fca5a180c9abad532de35dcd5f35
parent e0ad5943

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

+58 −12
Original line number Diff line number Diff line
@@ -775,17 +775,54 @@ public class ResolverDrawerLayout extends ViewGroup { 
        return false;

    }



    private boolean performAccessibilityActionCommon(int action) {

        switch (action) {

            case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD:

            case AccessibilityNodeInfo.ACTION_EXPAND:

            case R.id.accessibilityActionScrollDown:

                if (mCollapseOffset != 0) {

                    smoothScrollTo(0, 0);

                    return true;

                }

                break;

            case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD:

            case R.id.accessibilityActionScrollUp:

                if (mCollapseOffset < mCollapsibleHeight) {

                    smoothScrollTo(mCollapsibleHeight, 0);

                    return true;

                } else if ((mCollapseOffset < mCollapsibleHeight + mUncollapsibleHeight)

                        && isDismissable()) {

                    smoothScrollTo(mCollapsibleHeight + mUncollapsibleHeight, 0);

                    mDismissOnScrollerFinished = true;

                    return true;

                }

                break;

            case AccessibilityNodeInfo.ACTION_COLLAPSE:

                if (mCollapseOffset < mCollapsibleHeight) {

                    smoothScrollTo(mCollapsibleHeight, 0);

                    return true;

                }

                break;

            case AccessibilityNodeInfo.ACTION_DISMISS:

                if ((mCollapseOffset < mCollapsibleHeight + mUncollapsibleHeight)

                        && isDismissable()) {

                    smoothScrollTo(mCollapsibleHeight + mUncollapsibleHeight, 0);

                    mDismissOnScrollerFinished = true;

                    return true;

                }

                break;

        }



        return false;

    }



    @Override

    public boolean onNestedPrePerformAccessibilityAction(View target, int action, Bundle args) {

        if (super.onNestedPrePerformAccessibilityAction(target, action, args)) {

            return true;

        }



        if (action == AccessibilityNodeInfo.ACTION_SCROLL_FORWARD && mCollapseOffset != 0) {

            smoothScrollTo(0, 0);

            return true;

        }

        return false;

        return performAccessibilityActionCommon(action);

    }



    @Override
@@ -802,9 +839,23 @@ public class ResolverDrawerLayout extends ViewGroup { 


        if (isEnabled()) {

            if (mCollapseOffset != 0) {

                info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);

                info.addAction(AccessibilityAction.ACTION_SCROLL_FORWARD);

                info.addAction(AccessibilityAction.ACTION_EXPAND);

                info.addAction(AccessibilityAction.ACTION_SCROLL_DOWN);

                info.setScrollable(true);

            }

            if ((mCollapseOffset < mCollapsibleHeight + mUncollapsibleHeight)

                    && ((mCollapseOffset < mCollapsibleHeight) || isDismissable())) {

                info.addAction(AccessibilityAction.ACTION_SCROLL_BACKWARD);

                info.addAction(AccessibilityAction.ACTION_SCROLL_UP);

                info.setScrollable(true);

            }

            if (mCollapseOffset < mCollapsibleHeight) {

                info.addAction(AccessibilityAction.ACTION_COLLAPSE);

            }

            if (mCollapseOffset < mCollapsibleHeight + mUncollapsibleHeight && isDismissable()) {

                info.addAction(AccessibilityAction.ACTION_DISMISS);

            }

        }



        // This view should never get accessibility focus, but it's interactive
@@ -823,12 +874,7 @@ public class ResolverDrawerLayout extends ViewGroup { 
            return true;

        }



        if (action == AccessibilityNodeInfo.ACTION_SCROLL_FORWARD && mCollapseOffset != 0) {

            smoothScrollTo(0, 0);

            return true;

        }



        return false;

        return performAccessibilityActionCommon(action);

    }



    @Override