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

Commit 4ca6449e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "support scroll backward to minus one screen via voice/switch... 

Merge "Revert "support scroll backward to minus one screen via voice/switch access"" into ub-launcher3-qt-future-dev
parents 570d9a1e 3ad4ace2

src/com/android/launcher3/PagedView.java

+7 −15
Original line number Diff line number Diff line
@@ -1543,7 +1543,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
            snapToPage(getNextPage() - 1);

            return true;

        }

        return onOverscroll(-getMeasuredWidth());

        return false;

    }



    public boolean scrollRight() {
@@ -1551,15 +1551,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
            snapToPage(getNextPage() + 1);

            return true;

        }

        return onOverscroll(getMeasuredWidth());

    }



    protected boolean onOverscroll(int amount) {

        if (!mAllowOverScroll) return false;

        onScrollInteractionBegin();

        overScroll(amount);

        onScrollInteractionEnd();

        return true;

        return false;

    }



    @Override
@@ -1579,9 +1571,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfo(info);

        final boolean pagesFlipped = isPageOrderFlipped();

        int offset = (mAllowOverScroll ? 0 : 1);

        info.setScrollable(getPageCount() > offset);

        if (getCurrentPage() < getPageCount() - offset) {

        info.setScrollable(getPageCount() > 1);

        if (getCurrentPage() < getPageCount() - 1) {

            info.addAction(pagesFlipped ?

                AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_BACKWARD

                : AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_FORWARD);
@@ -1589,7 +1580,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
                AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_LEFT

                : AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_RIGHT);

        }

        if (getCurrentPage() >= offset) {

        if (getCurrentPage() > 0) {

            info.addAction(pagesFlipped ?

                AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_FORWARD

                : AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_BACKWARD);
@@ -1597,6 +1588,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
                AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_RIGHT

                : AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_LEFT);

        }



        // Accessibility-wise, PagedView doesn't support long click, so disabling it.

        // Besides disabling the accessibility long-click, this also prevents this view from getting

        // accessibility focus.
@@ -1615,7 +1607,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
    @Override

    public void onInitializeAccessibilityEvent(AccessibilityEvent event) {

        super.onInitializeAccessibilityEvent(event);

        event.setScrollable(mAllowOverScroll || getPageCount() > 1);

        event.setScrollable(getPageCount() > 1);

    }



    @Override

src/com/android/launcher3/Workspace.java

+0 −7
Original line number Diff line number Diff line
@@ -1034,13 +1034,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
        }

    }



    @Override

    protected boolean onOverscroll(int amount) {

        // Enforce overscroll on -1 direction

        if ((amount > 0 && !mIsRtl) || (amount < 0 && mIsRtl)) return false;

        return super.onOverscroll(amount);

    }



    @Override

    protected boolean shouldFlingForVelocity(int velocityX) {

        // When the overlay is moving, the fling or settle transition is controlled by the overlay.