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

Commit ab6be317 authored by Adam Cohen's avatar Adam Cohen
Browse files

Fix issue where can't interact with Workspace while App => Home is running 

=> Regression from recent CL ag/8074890
=> Fix which scopes the change down to the RecentsView, but not all PagedViews

Bug 136733573

Change-Id: I0abaa61b2b132d8086dc3b2cb3e3e9c1f181b5f5
parent 70697e48

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

+5 −0
Original line number Diff line number Diff line
@@ -472,6 +472,11 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        }

    }



    @Override

    protected boolean shouldBlockGestures(MotionEvent ev) {

        return Utilities.shouldDisableGestures(ev);

    }



    @Override

    public boolean onTouchEvent(MotionEvent ev) {

        super.onTouchEvent(ev);

src/com/android/launcher3/PagedView.java

+6 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.launcher3;



import static com.android.launcher3.Utilities.shouldDisableGestures;

import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessibilityEnabled;

import static com.android.launcher3.compat.AccessibilityManagerCompat.isObservedEventType;

import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
@@ -847,7 +846,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
         */



        // Skip touch handling if there are no pages to swipe

        if (getChildCount() <= 0 || shouldDisableGestures(ev)) return false;

        if (getChildCount() <= 0 || shouldBlockGestures(ev)) return false;



        acquireVelocityTrackerAndAddMovement(ev);
@@ -1092,10 +1091,14 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
        mAllowOverScroll = enable;

    }



    protected boolean shouldBlockGestures(MotionEvent ev) {

        return false;

    }



    @Override

    public boolean onTouchEvent(MotionEvent ev) {

        // Skip touch handling if there are no pages to swipe

        if (getChildCount() <= 0 || shouldDisableGestures(ev)) return false;

        if (getChildCount() <= 0 || shouldBlockGestures(ev)) return false;



        acquireVelocityTrackerAndAddMovement(ev);