Merge "Compose overscroll gesture updates" into ub-launcher3-master (027cb32a) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -484,7 +484,9 @@ public class TouchInteractionService extends Service implements PluginListener<O
		base = new AssistantInputConsumer(this, newGestureState, base, mInputMonitorCompat);
		}

		if (mOverscrollPlugin != null) {
		if (FeatureFlags.ENABLE_QUICK_CAPTURE_GESTURE.get()
		&& (mOverscrollPlugin != null)
		&& mOverscrollPlugin.isActive()) {
		// Put the overscroll gesture as higher priority than the Assistant or base gestures
		base = new OverscrollInputConsumer(this, newGestureState, base, mInputMonitorCompat,
		mOverscrollPlugin);

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverscrollInputConsumer.java

+70 −7

Original line number	Diff line number	Diff line
		@@ -26,14 +26,17 @@ import static com.android.launcher3.Utilities.squaredHypot;

		import android.content.Context;
		import android.graphics.PointF;
		import android.view.GestureDetector;
		import android.view.MotionEvent;
		import android.view.ViewConfiguration;

		import androidx.annotation.Nullable;

		import com.android.launcher3.BaseDraggingActivity;
		import com.android.launcher3.R;
		import com.android.quickstep.GestureState;
		import com.android.quickstep.InputConsumer;
		import com.android.quickstep.views.LauncherRecentsView;
		import com.android.quickstep.views.RecentsView;
		import com.android.systemui.plugins.OverscrollPlugin;
		import com.android.systemui.shared.system.InputMonitorCompat;
		@@ -47,12 +50,12 @@ public class OverscrollInputConsumer<T extends BaseDraggingActivity> extends Del

		private static final String TAG = "OverscrollInputConsumer";

		private static final int ANGLE_THRESHOLD = 35; // Degrees

		private final PointF mDownPos = new PointF();
		private final PointF mLastPos = new PointF();
		private final PointF mStartDragPos = new PointF();
		private final int mAngleThreshold;

		private final float mFlingThresholdPx;
		private int mActivePointerId = -1;
		private boolean mPassedSlop = false;

		@@ -60,19 +63,28 @@ public class OverscrollInputConsumer<T extends BaseDraggingActivity> extends Del

		private final Context mContext;
		private final GestureState mGestureState;
		@Nullable private final OverscrollPlugin mPlugin;
		@Nullable
		private final OverscrollPlugin mPlugin;
		private final GestureDetector mGestureDetector;

		private RecentsView mRecentsView;

		public OverscrollInputConsumer(Context context, GestureState gestureState,
		InputConsumer delegate, InputMonitorCompat inputMonitor, OverscrollPlugin plugin) {
		super(delegate, inputMonitor);

		mAngleThreshold = context.getResources()
		.getInteger(R.integer.assistant_gesture_corner_deg_threshold);
		mFlingThresholdPx = context.getResources()
		.getDimension(R.dimen.gestures_overscroll_fling_threshold);
		mContext = context;
		mGestureState = gestureState;
		mPlugin = plugin;

		float slop = ViewConfiguration.get(context).getScaledTouchSlop();

		mSquaredSlop = slop * slop;
		mGestureDetector = new GestureDetector(context, new FlingGestureListener());

		gestureState.getActivityInterface().createActivityInitListener(this::onActivityInit)
		.register();
		@@ -139,21 +151,29 @@ public class OverscrollInputConsumer<T extends BaseDraggingActivity> extends Del

		mPassedSlop = true;
		mStartDragPos.set(mLastPos.x, mLastPos.y);

		if (isOverscrolled()) {
		setActive(ev);

		if (mPlugin != null) {
		mPlugin.onTouchStart(getDeviceState(), getUnderlyingActivity());
		}
		} else {
		mState = STATE_DELEGATE_ACTIVE;
		}
		}
		}

		if (mPassedSlop && mState != STATE_DELEGATE_ACTIVE && isOverscrolled()
		&& mPlugin != null) {
		mPlugin.onTouchTraveled(getDistancePx());
		}

		break;
		}
		case ACTION_CANCEL:
		case ACTION_UP:
		if (mState != STATE_DELEGATE_ACTIVE && mPassedSlop && mPlugin != null) {
		mPlugin.onOverscroll(getDeviceState());
		mPlugin.onTouchEnd(getDistancePx());
		}

		mPassedSlop = false;
		@@ -161,6 +181,10 @@ public class OverscrollInputConsumer<T extends BaseDraggingActivity> extends Del
		break;
		}

		if (mState != STATE_DELEGATE_ACTIVE) {
		mGestureDetector.onTouchEvent(ev);
		}

		if (mState != STATE_ACTIVE) {
		mDelegate.onMotionEvent(ev);
		}
		@@ -168,12 +192,19 @@ public class OverscrollInputConsumer<T extends BaseDraggingActivity> extends Del

		private boolean isOverscrolled() {
		// Make sure there isn't an app to quick switch to on our right
		boolean atRightMostApp = (mRecentsView == null \|\| mRecentsView.getRunningTaskIndex() <= 0);
		int maxIndex = 0;
		if ((mRecentsView instanceof LauncherRecentsView)
		&& ((LauncherRecentsView) mRecentsView).hasRecentsExtraCard()) {
		maxIndex = 1;
		}

		boolean atRightMostApp = (mRecentsView == null
		\|\| mRecentsView.getRunningTaskIndex() <= maxIndex);

		// Check if the gesture is within our angle threshold of horizontal
		float deltaY = Math.abs(mLastPos.y - mDownPos.y);
		float deltaX = mDownPos.x - mLastPos.x; // Positive if this is a gesture to the left
		boolean angleInBounds = Math.toDegrees(Math.atan2(deltaY, deltaX)) < ANGLE_THRESHOLD;
		boolean angleInBounds = Math.toDegrees(Math.atan2(deltaY, deltaX)) < mAngleThreshold;

		return atRightMostApp && angleInBounds;
		}
		@@ -193,4 +224,36 @@ public class OverscrollInputConsumer<T extends BaseDraggingActivity> extends Del

		return deviceState;
		}

		private int getDistancePx() {
		return (int) Math.hypot(mLastPos.x - mDownPos.x, mLastPos.y - mDownPos.y);
		}

		private String getUnderlyingActivity() {
		return mGestureState.getRunningTask().topActivity.flattenToString();
		}

		private class FlingGestureListener extends GestureDetector.SimpleOnGestureListener {
		@Override
		public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
		if (isValidAngle(velocityX, -velocityY)
		&& getDistancePx() >= mFlingThresholdPx
		&& mState != STATE_DELEGATE_ACTIVE) {

		if (mPlugin != null) {
		mPlugin.onFling(-velocityX);
		}
		}
		return true;
		}

		private boolean isValidAngle(float deltaX, float deltaY) {
		float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX));
		// normalize so that angle is measured clockwise from horizontal in the bottom right
		// corner and counterclockwise from horizontal in the bottom left corner

		angle = angle > 90 ? 180 - angle : angle;
		return (angle < mAngleThreshold);
		}
		}
		}

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -377,6 +377,11 @@ public class LauncherRecentsView extends RecentsView<Launcher> implements StateL
		addView(mRecentsExtraViewContainer, 0);
		}

		@Override
		public boolean hasRecentsExtraCard() {
		return mRecentsExtraViewContainer != null;
		}

		@Override
		public void setContentAlpha(float alpha) {
		super.setContentAlpha(alpha);

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -830,6 +830,11 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl

		public abstract void startHome();

		/** `true` if there is a +1 space available in overview. */
		public boolean hasRecentsExtraCard() {
		return false;
		}

		public void reset() {
		setCurrentTask(-1);
		mIgnoreResetTaskId = -1;

quickstep/res/values/dimens.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -77,4 +77,7 @@

		<!-- Distance to move elements when swiping up to go home from launcher -->
		<dimen name="home_pullback_distance">28dp</dimen>

		<!-- Overscroll Gesture -->
		<dimen name="gestures_overscroll_fling_threshold">40dp</dimen>
		</resources>