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

Commit 8a3f1b6b authored by Jan-Willem Maarse's avatar Jan-Willem Maarse Committed by Android Git Automerger
Browse files

am 21116068: Merge "Ignore generic motion events if custom content doesn\'t... 

am 21116068: Merge "Ignore generic motion events if custom content doesn\'t allow scrolling" into ub-now-porkchop

* commit '21116068':
  Ignore generic motion events if custom content doesn't allow scrolling
parents 91402c8e 21116068

src/com/android/launcher3/Workspace.java

+11 −0
Original line number Diff line number Diff line
@@ -1115,6 +1115,17 @@ public class Workspace extends SmoothPagedView 
        return super.onInterceptTouchEvent(ev);

    }



    @Override

    public boolean onGenericMotionEvent(MotionEvent event) {

        // Ignore pointer scroll events if the custom content doesn't allow scrolling.

        if ((getScreenIdForPageIndex(getCurrentPage()) == CUSTOM_CONTENT_SCREEN_ID)

                && (mCustomContentCallbacks != null)

                && !mCustomContentCallbacks.isScrollingAllowed()) {

            return false;

        }

        return super.onGenericMotionEvent(event);

    }



    protected void reinflateWidgetsIfNecessary() {

        final int clCount = getChildCount();

        for (int i = 0; i < clCount; i++) {