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

Commit 9edc8eb7 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Allow swipe up to all apps anywhere on workspace" into ub-launcher3-qt-dev

parents 563178b1 e2e95330

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -44,7 +44,6 @@ import com.android.launcher3.anim.Interpolators; 
import com.android.launcher3.touch.AbstractStateChangeTouchController;

import com.android.launcher3.touch.AbstractStateChangeTouchController;

import com.android.launcher3.touch.SwipeDetector;

import com.android.launcher3.touch.SwipeDetector;

import com.android.launcher3.uioverrides.states.OverviewState;

import com.android.launcher3.uioverrides.states.OverviewState;

import com.android.launcher3.uioverrides.touchcontrollers.PortraitOverviewStateTouchHelper;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;

import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;

import com.android.quickstep.RecentsModel;

import com.android.quickstep.RecentsModel;
@@ -114,8 +113,10 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
                return false;

                return false;

            }

            }

        } else {

        } else {

            // If we are swiping to all apps instead of overview, allow it from anywhere.

            boolean interceptAnywhere = mLauncher.isInState(NORMAL) && !mAllowDragToOverview;

            // For all other states, only listen if the event originated below the hotseat height

            // For all other states, only listen if the event originated below the hotseat height

            if (!isTouchOverHotseat(mLauncher, ev)) {

            if (!interceptAnywhere && !isTouchOverHotseat(mLauncher, ev)) {

                return false;

                return false;

            }

            }

        }

        }