Sending original motion events to launcher overlay along with inferred values
Bug: 273828110
Flag: aconfig use_activity_overlay disabled
Test: Manual
Change-Id: I23cd72a964a647a0fd830befa096f3328e12ff8a
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 496cb4e..2b203e1 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -258,7 +258,7 @@
import com.android.systemui.plugins.LauncherOverlayPlugin;
import com.android.systemui.plugins.PluginListener;
import com.android.systemui.plugins.shared.LauncherOverlayManager;
-import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlay;
+import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlayTouchProxy;
import com.android.wm.shell.Flags;
import java.io.FileDescriptor;
@@ -2810,7 +2810,7 @@
/**
* Call this after onCreate to set or clear overlay.
*/
- public void setLauncherOverlay(LauncherOverlay overlay) {
+ public void setLauncherOverlay(LauncherOverlayTouchProxy overlay) {
mWorkspace.setLauncherOverlay(overlay);
}
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index ca83245..1fede56 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1140,7 +1140,7 @@
mEdgeGlowLeft.onPullDistance(0f, 1f - displacement);
}
if (!mEdgeGlowRight.isFinished()) {
- mEdgeGlowRight.onPullDistance(0f, displacement);
+ mEdgeGlowRight.onPullDistance(0f, displacement, ev);
}
}
@@ -1320,10 +1320,10 @@
int consumed = 0;
if (delta < 0 && mEdgeGlowRight.getDistance() != 0f) {
consumed = Math.round(size *
- mEdgeGlowRight.onPullDistance(delta / size, displacement));
+ mEdgeGlowRight.onPullDistance(delta / size, displacement, ev));
} else if (delta > 0 && mEdgeGlowLeft.getDistance() != 0f) {
consumed = Math.round(-size *
- mEdgeGlowLeft.onPullDistance(-delta / size, 1 - displacement));
+ mEdgeGlowLeft.onPullDistance(-delta / size, 1 - displacement, ev));
}
delta -= consumed;
}
@@ -1341,14 +1341,14 @@
final float pulledToX = oldScroll + delta;
if (pulledToX < mMinScroll) {
- mEdgeGlowLeft.onPullDistance(-delta / size, 1.f - displacement);
+ mEdgeGlowLeft.onPullDistance(-delta / size, 1.f - displacement, ev);
if (!mEdgeGlowRight.isFinished()) {
- mEdgeGlowRight.onRelease();
+ mEdgeGlowRight.onRelease(ev);
}
} else if (pulledToX > mMaxScroll) {
- mEdgeGlowRight.onPullDistance(delta / size, displacement);
+ mEdgeGlowRight.onPullDistance(delta / size, displacement, ev);
if (!mEdgeGlowLeft.isFinished()) {
- mEdgeGlowLeft.onRelease();
+ mEdgeGlowLeft.onRelease(ev);
}
}
@@ -1356,7 +1356,6 @@
postInvalidateOnAnimation();
}
}
-
} else {
awakenScrollBars();
}
@@ -1456,10 +1455,11 @@
}
invalidate();
}
+ mEdgeGlowLeft.onFlingVelocity(velocity);
+ mEdgeGlowRight.onFlingVelocity(velocity);
}
-
- mEdgeGlowLeft.onRelease();
- mEdgeGlowRight.onRelease();
+ mEdgeGlowLeft.onRelease(ev);
+ mEdgeGlowRight.onRelease(ev);
// End any intermediate reordering states
resetTouchState();
break;
@@ -1468,8 +1468,8 @@
if (mIsBeingDragged) {
runOnPageScrollsInitialized(this::snapToDestination);
}
- mEdgeGlowLeft.onRelease();
- mEdgeGlowRight.onRelease();
+ mEdgeGlowLeft.onRelease(ev);
+ mEdgeGlowRight.onRelease(ev);
resetTouchState();
break;
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index ac0d7ce..86f31a1 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -125,8 +125,8 @@
import com.android.launcher3.widget.WidgetManagerHelper;
import com.android.launcher3.widget.dragndrop.AppWidgetHostViewDragListener;
import com.android.launcher3.widget.util.WidgetSizes;
-import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlay;
import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlayCallbacks;
+import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlayTouchProxy;
import java.util.ArrayList;
import java.util.Iterator;
@@ -1237,7 +1237,7 @@
mLauncher.onPageEndTransition();
}
- public void setLauncherOverlay(LauncherOverlay overlay) {
+ public void setLauncherOverlay(LauncherOverlayTouchProxy overlay) {
final EdgeEffectCompat newEffect;
if (overlay == null) {
newEffect = new EdgeEffectCompat(getContext());
diff --git a/src/com/android/launcher3/util/EdgeEffectCompat.java b/src/com/android/launcher3/util/EdgeEffectCompat.java
index 491582b..ca37259 100644
--- a/src/com/android/launcher3/util/EdgeEffectCompat.java
+++ b/src/com/android/launcher3/util/EdgeEffectCompat.java
@@ -16,6 +16,7 @@
package com.android.launcher3.util;
import android.content.Context;
+import android.view.MotionEvent;
import android.widget.EdgeEffect;
import com.android.launcher3.Utilities;
@@ -43,4 +44,14 @@
return deltaDistance;
}
}
+
+ public float onPullDistance(float deltaDistance, float displacement, MotionEvent ev) {
+ return onPullDistance(deltaDistance, displacement);
+ }
+
+ public void onFlingVelocity(int velocity) { }
+
+ public void onRelease(MotionEvent ev) {
+ onRelease();
+ }
}
diff --git a/src/com/android/launcher3/util/OverlayEdgeEffect.java b/src/com/android/launcher3/util/OverlayEdgeEffect.java
index 2ef1e1f..d09d801 100644
--- a/src/com/android/launcher3/util/OverlayEdgeEffect.java
+++ b/src/com/android/launcher3/util/OverlayEdgeEffect.java
@@ -17,10 +17,13 @@
import android.content.Context;
import android.graphics.Canvas;
+import android.os.SystemClock;
+import android.view.MotionEvent;
import android.widget.EdgeEffect;
+import com.android.launcher3.BuildConfig;
import com.android.launcher3.Utilities;
-import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlay;
+import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlayTouchProxy;
/**
* Extension of {@link EdgeEffect} which shows the Launcher overlay
@@ -28,11 +31,11 @@
public class OverlayEdgeEffect extends EdgeEffectCompat {
protected float mDistance;
- protected final LauncherOverlay mOverlay;
+ protected final LauncherOverlayTouchProxy mOverlay;
protected boolean mIsScrolling;
protected final boolean mIsRtl;
- public OverlayEdgeEffect(Context context, LauncherOverlay overlay) {
+ public OverlayEdgeEffect(Context context, LauncherOverlayTouchProxy overlay) {
super(context);
mOverlay = overlay;
mIsRtl = Utilities.isRtl(context.getResources());
@@ -44,12 +47,30 @@
}
public float onPullDistance(float deltaDistance, float displacement) {
+ // Fallback implementation, will never actually get called
+ if (BuildConfig.IS_DEBUG_DEVICE) {
+ throw new RuntimeException("Wrong method called");
+ }
+ MotionEvent mv = MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis(),
+ MotionEvent.ACTION_MOVE, displacement, 0, 0);
+ try {
+ return onPullDistance(deltaDistance, displacement, mv);
+ } finally {
+ mv.recycle();
+ }
+ }
+
+ @Override
+ public float onPullDistance(float deltaDistance, float displacement, MotionEvent ev) {
mDistance = Math.max(0f, deltaDistance + mDistance);
if (!mIsScrolling) {
- mOverlay.onScrollInteractionBegin();
+ int originalAction = ev.getAction();
+ ev.setAction(MotionEvent.ACTION_DOWN);
+ mOverlay.onOverlayMotionEvent(ev, 0);
+ ev.setAction(originalAction);
mIsScrolling = true;
}
- mOverlay.onScrollChange(mDistance, mIsRtl);
+ mOverlay.onOverlayMotionEvent(ev, mDistance);
return mDistance > 0 ? deltaDistance : 0;
}
@@ -63,9 +84,30 @@
@Override
public void onRelease() {
+ // Fallback implementation, will never actually get called
+ if (BuildConfig.IS_DEBUG_DEVICE) {
+ throw new RuntimeException("Wrong method called");
+ }
+ MotionEvent mv = MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis(),
+ MotionEvent.ACTION_UP, mDistance, 0, 0);
+ onRelease(mv);
+ mv.recycle();
+ }
+
+ @Override
+ public void onFlingVelocity(int velocity) {
+ mOverlay.onFlingVelocity(velocity);
+ }
+
+ @Override
+ public void onRelease(MotionEvent ev) {
if (mIsScrolling) {
+ int originalAction = ev.getAction();
+ ev.setAction(MotionEvent.ACTION_UP);
+ mOverlay.onOverlayMotionEvent(ev, mDistance);
+ ev.setAction(originalAction);
+
mDistance = 0;
- mOverlay.onScrollInteractionEnd();
mIsScrolling = false;
}
}
diff --git a/src_plugins/com/android/systemui/plugins/shared/LauncherOverlayManager.java b/src_plugins/com/android/systemui/plugins/shared/LauncherOverlayManager.java
index 54cc0bc..a940774 100644
--- a/src_plugins/com/android/systemui/plugins/shared/LauncherOverlayManager.java
+++ b/src_plugins/com/android/systemui/plugins/shared/LauncherOverlayManager.java
@@ -15,6 +15,8 @@
*/
package com.android.systemui.plugins.shared;
+import android.view.MotionEvent;
+
import java.io.PrintWriter;
/**
@@ -47,7 +49,11 @@
default void onActivityDestroyed() { }
- interface LauncherOverlay {
+ /**
+ * @deprecated use LauncherOverlayTouchProxy directly
+ */
+ @Deprecated
+ interface LauncherOverlay extends LauncherOverlayTouchProxy {
/**
* Touch interaction leading to overscroll has begun
@@ -70,6 +76,38 @@
* @param callbacks A set of callbacks provided by Launcher in relation to the overlay
*/
void setOverlayCallbacks(LauncherOverlayCallbacks callbacks);
+
+ @Override
+ default void onFlingVelocity(float velocity) { }
+
+ @Override
+ default void onOverlayMotionEvent(MotionEvent ev, float scrollProgress) {
+ switch (ev.getAction()) {
+ case MotionEvent.ACTION_DOWN -> onScrollInteractionBegin();
+ case MotionEvent.ACTION_MOVE -> onScrollChange(scrollProgress, false);
+ case MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> onScrollInteractionEnd();
+ }
+
+ }
+ }
+
+ interface LauncherOverlayTouchProxy {
+
+ /**
+ * Called just before finishing scroll interaction to indicate the fling velocity
+ */
+ void onFlingVelocity(float velocity);
+
+ /**
+ * Called to dispatch various motion events to the overlay
+ */
+ void onOverlayMotionEvent(MotionEvent ev, float scrollProgress);
+
+ /**
+ * Called when the launcher is ready to use the overlay
+ * @param callbacks A set of callbacks provided by Launcher in relation to the overlay
+ */
+ default void setOverlayCallbacks(LauncherOverlayCallbacks callbacks) { }
}
interface LauncherOverlayCallbacks {