From 1d90321484824563bd04639bcf3670559e9d8d28 Mon Sep 17 00:00:00 2001 From: Holly Sun Date: Tue, 16 Apr 2024 21:08:54 -0700 Subject: [PATCH] [omni] Let parent to allow intercept when it's in the 2nd stage. Discussed with Andy for ideas - instead of passing the outer touch slop out, it might be easier to let parent to allow intercept when it's in the 2nd stage (e.g., OverviewInputConsumer doesn't have touch slop handling logic). So we can go through this if: https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:packages/apps/Launcher3/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java;l=105;drc=deee0d06f624223b808593997cf22042c9aa5142 `mDelegate` can be `OverviewInputConsumer` or `OtherActivityInputConsumer` or `TaskbarUnstashInputConsumer`. Bug: 330446193 Flag: legacy ENABLE_LPNH_TWO_STAGES disabled Test: manual Change-Id: I1f33172f1614a750a01632c8c945ee5e5cbd7adc --- .../com/android/quickstep/GestureState.java | 20 +++++++++++++++++++ .../quickstep/TouchInteractionService.java | 4 ++-- .../NavHandleLongPressInputConsumer.java | 9 ++++++++- .../OtherActivityInputConsumer.java | 5 +++-- .../inputconsumers/OverviewInputConsumer.java | 7 ++++++- .../TaskbarUnstashInputConsumer.java | 13 ++++++++++-- 6 files changed, 50 insertions(+), 8 deletions(-) diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java index c8a91dfde3..81c9d4a674 100644 --- a/quickstep/src/com/android/quickstep/GestureState.java +++ b/quickstep/src/com/android/quickstep/GestureState.java @@ -186,6 +186,7 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL private final long mSwipeUpStartTimeMs = SystemClock.uptimeMillis(); private boolean mHandlingAtomicEvent; + private boolean mIsInExtendedSlopRegion; public GestureState(OverviewComponentObserver componentObserver, int gestureId) { mHomeIntent = componentObserver.getHomeIntent(); @@ -493,6 +494,25 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL mStateCallback.setState(STATE_RECENTS_ANIMATION_ENDED); } + /** + * Set whether it's in long press nav handle (LPNH)'s extended touch slop region, e.g., second + * stage region in order to continue respect LPNH and ignore other touch slop logic. + * This will only be set to true when flag ENABLE_LPNH_TWO_STAGES is turned on. + */ + public void setIsInExtendedSlopRegion(boolean isInExtendedSlopRegion) { + if (DeviceConfigWrapper.get().getEnableLpnhTwoStages()) { + mIsInExtendedSlopRegion = isInExtendedSlopRegion; + } + } + + /** + * Returns whether it's in LPNH's extended touch slop region. This is only valid when flag + * ENABLE_LPNH_TWO_STAGES is turned on. + */ + public boolean isInExtendedSlopRegion() { + return mIsInExtendedSlopRegion; + } + /** * Returns and clears the canceled animation thumbnail data. This call only returns a value * while STATE_RECENTS_ANIMATION_CANCELED state is being set, and the caller is responsible for diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 832f4e1b4d..f94a29c74b 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -1018,7 +1018,7 @@ public class TouchInteractionService extends Service { .append("TaskbarActivityContext != null, ") .append("using TaskbarUnstashInputConsumer"); base = new TaskbarUnstashInputConsumer(this, base, mInputMonitorCompat, tac, - mOverviewCommandHelper); + mOverviewCommandHelper, mGestureState); } } if (enableBubblesLongPressNavHandle()) { @@ -1046,7 +1046,7 @@ public class TouchInteractionService extends Service { } reasonString.append("using NavHandleLongPressInputConsumer"); base = new NavHandleLongPressInputConsumer(this, base, mInputMonitorCompat, - mDeviceState, navHandle); + mDeviceState, navHandle, mGestureState); } if (!enableBubblesLongPressNavHandle()) { diff --git a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java index 075e53988b..848a43afb1 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java @@ -31,6 +31,7 @@ import com.android.launcher3.Utilities; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.util.DisplayController; import com.android.quickstep.DeviceConfigWrapper; +import com.android.quickstep.GestureState; import com.android.quickstep.InputConsumer; import com.android.quickstep.NavHandle; import com.android.quickstep.RecentsAnimationDeviceState; @@ -61,13 +62,14 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { private final NavHandle mNavHandle; private final StatsLogManager mStatsLogManager; private final TopTaskTracker mTopTaskTracker; + private final GestureState mGestureState; private MotionEvent mCurrentDownEvent; private boolean mDeepPressLogged; // Whether deep press has been logged for the current touch. public NavHandleLongPressInputConsumer(Context context, InputConsumer delegate, InputMonitorCompat inputMonitor, RecentsAnimationDeviceState deviceState, - NavHandle navHandle) { + NavHandle navHandle, GestureState gestureState) { super(delegate, inputMonitor); mScreenWidth = DisplayController.INSTANCE.get(context).getInfo().currentSize.x; mDeepPressEnabled = DeviceConfigWrapper.get().getEnableLpnhDeepPress(); @@ -82,6 +84,8 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { mTouchSlopSquaredOriginal = deviceState.getSquaredTouchSlop(); mTouchSlopSquared = mTouchSlopSquaredOriginal; mOuterTouchSlopSquared = mTouchSlopSquared * (twoStageMultiplier * twoStageMultiplier); + mGestureState = gestureState; + mGestureState.setIsInExtendedSlopRegion(false); if (DEBUG_NAV_HANDLE) { Log.d(TAG, "mLongPressTimeout=" + mLongPressTimeout); Log.d(TAG, "mOuterLongPressTimeout=" + mOuterLongPressTimeout); @@ -126,6 +130,7 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { } mCurrentDownEvent = MotionEvent.obtain(ev); mTouchSlopSquared = mTouchSlopSquaredOriginal; + mGestureState.setIsInExtendedSlopRegion(false); mDeepPressLogged = false; if (isInNavBarHorizontalArea(ev.getRawX())) { mNavHandleLongPressHandler.onTouchStarted(mNavHandle); @@ -154,6 +159,7 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { - (int) (ev.getEventTime() - ev.getDownTime()); MAIN_EXECUTOR.getHandler().postDelayed(mTriggerLongPress, delay); mTouchSlopSquared = mOuterTouchSlopSquared; + mGestureState.setIsInExtendedSlopRegion(true); if (DEBUG_NAV_HANDLE) { Log.d(TAG, "Touch in middle region!"); } @@ -219,6 +225,7 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { if (DEBUG_NAV_HANDLE) { Log.d(TAG, "cancelLongPress"); } + mGestureState.setIsInExtendedSlopRegion(false); MAIN_EXECUTOR.getHandler().removeCallbacks(mTriggerLongPress); mNavHandleLongPressHandler.onTouchFinished(mNavHandle, reason); } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java index 9f39476c2c..0d450c6b15 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java @@ -284,8 +284,9 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC float horizontalDist = Math.abs(displacementX); float upDist = -displacement; - boolean passedSlop = mGestureState.isTrackpadGesture() || squaredHypot( - displacementX, displacementY) >= mSquaredTouchSlop; + boolean passedSlop = mGestureState.isTrackpadGesture() + || (squaredHypot(displacementX, displacementY) >= mSquaredTouchSlop + && !mGestureState.isInExtendedSlopRegion()); if (!mPassedSlopOnThisGesture && passedSlop) { mPassedSlopOnThisGesture = true; diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java index bb8d1d7d33..c61f71d330 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java @@ -48,6 +48,7 @@ public class OverviewInputConsumer, T extends RecentsView private final BaseContainerInterface mContainerInterface; private final BaseDragLayer mTarget; private final InputMonitorCompat mInputMonitor; + private final GestureState mGestureState; private final int[] mLocationOnScreen = new int[2]; @@ -62,6 +63,7 @@ public class OverviewInputConsumer, T extends RecentsView mInputMonitor = inputMonitor; mStartingInActivityBounds = startingInActivityBounds; mContainerInterface = gestureState.getContainerInterface(); + mGestureState = gestureState; mTarget = container.getDragLayer(); mTarget.getLocationOnScreen(mLocationOnScreen); @@ -84,7 +86,10 @@ public class OverviewInputConsumer, T extends RecentsView ev.setEdgeFlags(flags | Utilities.EDGE_NAV_BAR); } ev.offsetLocation(-mLocationOnScreen[0], -mLocationOnScreen[1]); - boolean handled = mTarget.proxyTouchEvent(ev, mStartingInActivityBounds); + boolean handled = false; + if (mGestureState == null || !mGestureState.isInExtendedSlopRegion()) { + handled = mTarget.proxyTouchEvent(ev, mStartingInActivityBounds); + } ev.offsetLocation(mLocationOnScreen[0], mLocationOnScreen[1]); ev.setEdgeFlags(flags); diff --git a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java index cd180ba82d..6b3e6e9dbe 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java @@ -42,6 +42,7 @@ import com.android.launcher3.taskbar.TaskbarTranslationController.TransitionCall import com.android.launcher3.taskbar.bubbles.BubbleControllers; import com.android.launcher3.touch.OverScroll; import com.android.launcher3.util.DisplayController; +import com.android.quickstep.GestureState; import com.android.quickstep.InputConsumer; import com.android.quickstep.OverviewCommandHelper; import com.android.systemui.shared.system.InputMonitorCompat; @@ -76,10 +77,11 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer { private final int mStashedTaskbarBottomEdge; private final @Nullable TransitionCallback mTransitionCallback; + private final GestureState mGestureState; public TaskbarUnstashInputConsumer(Context context, InputConsumer delegate, InputMonitorCompat inputMonitor, TaskbarActivityContext taskbarActivityContext, - OverviewCommandHelper overviewCommandHelper) { + OverviewCommandHelper overviewCommandHelper, GestureState gestureState) { super(delegate, inputMonitor); mTaskbarActivityContext = taskbarActivityContext; mOverviewCommandHelper = overviewCommandHelper; @@ -103,6 +105,7 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer { mTransitionCallback = mIsTransientTaskbar ? taskbarActivityContext.getTranslationCallbacks() : null; + mGestureState = gestureState; } @Override @@ -110,6 +113,11 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer { return TYPE_TASKBAR_STASH | TYPE_CURSOR_HOVER | mDelegate.getType(); } + @Override + public boolean allowInterceptByParent() { + return super.allowInterceptByParent() && !mHasPassedTaskbarNavThreshold; + } + @Override public void onMotionEvent(MotionEvent ev) { if (mState != STATE_ACTIVE) { @@ -173,7 +181,8 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer { boolean passedTaskbarNavThreshold = dY < 0 && Math.abs(dY) >= mTaskbarNavThreshold; - if (!mHasPassedTaskbarNavThreshold && passedTaskbarNavThreshold) { + if (!mHasPassedTaskbarNavThreshold && passedTaskbarNavThreshold + && !mGestureState.isInExtendedSlopRegion()) { mHasPassedTaskbarNavThreshold = true; if (mIsInBubbleBarArea && mIsVerticalGestureOverBubbleBar) { mTaskbarActivityContext.onSwipeToOpenBubblebar();