aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 19:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add temporary debug logs to OtherActivityInputConsumer" into main

Browse Source
This commit is contained in:
Schneider Victor-tulias
2024-07-12 16:57:31 +00:00
committed by Android (Google) Code Review
parent 535267a00d 2ba69c2d3e
commit 25ff85efdc
1 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
View File

@@ -70,6 +70,9 @@ import java.util.function.Consumer;
*/
public class OtherActivityInputConsumer extends ContextWrapper implements InputConsumer {
private static final String TAG = "OtherActivityInputConsumer";
private static final boolean DEBUG = true;
public static final String DOWN_EVT = "OtherActivityInputConsumer.DOWN";
private static final String UP_EVT = "OtherActivityInputConsumer.UP";
@@ -230,6 +233,9 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
// Start the window animation on down to give more time for launcher to draw if the
// user didn't start the gesture over the back button
if (DEBUG) {
Log.d(TAG, "ACTION_DOWN: mIsDeferredDownTarget=" + mIsDeferredDownTarget);
}
if (!mIsDeferredDownTarget) {
startTouchTrackingForWindowAnimation(ev.getEventTime());
}
@@ -284,9 +290,18 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
float horizontalDist = Math.abs(displacementX);
float upDist = -displacement;
boolean passedSlop = mGestureState.isTrackpadGesture()
|| (squaredHypot(displacementX, displacementY) >= mSquaredTouchSlop
&& !mGestureState.isInExtendedSlopRegion());
boolean isTrackpadGesture = mGestureState.isTrackpadGesture();
float squaredHypot = squaredHypot(displacementX, displacementY);
boolean isInExtendedSlopRegion = !mGestureState.isInExtendedSlopRegion();
boolean passedSlop = isTrackpadGesture
|| (squaredHypot >= mSquaredTouchSlop
&& isInExtendedSlopRegion);
if (DEBUG) {
Log.d(TAG, "ACTION_MOVE: passedSlop=" + passedSlop
+ " ( " + isTrackpadGesture
+ " || (" + squaredHypot + " >= " + mSquaredTouchSlop
+ " && " + isInExtendedSlopRegion + " ))");
}
if (!mPassedSlopOnThisGesture && passedSlop) {
mPassedSlopOnThisGesture = true;
@@ -306,6 +321,9 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
boolean isLikelyToStartNewTask =
haveNotPassedSlopOnContinuedGesture || swipeWithinQuickSwitchRange;
if (DEBUG) {
Log.d(TAG, "ACTION_MOVE: mPassedPilferInputSlop=" + mPassedPilferInputSlop);
}
if (!mPassedPilferInputSlop) {
if (passedSlop) {
// Horizontal gesture is not allowed in this region
@@ -394,6 +412,10 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
mInteractionHandler.initWhenReady(
"OtherActivityInputConsumer.startTouchTrackingForWindowAnimation");
if (DEBUG) {
Log.d(TAG, "startTouchTrackingForWindowAnimation: isRecentsAnimationRunning="
+ mTaskAnimationManager.isRecentsAnimationRunning());
}
if (mTaskAnimationManager.isRecentsAnimationRunning()) {
mActiveCallbacks = mTaskAnimationManager.continueRecentsAnimation(mGestureState);
mActiveCallbacks.removeListener(mCleanupHandler);
@@ -422,6 +444,11 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
*/
private void finishTouchTracking(MotionEvent ev) {
TraceHelper.INSTANCE.beginSection(UP_EVT);
if (DEBUG) {
Log.d(TAG, "finishTouchTracking: mPassedWindowMoveSlop=" + mPassedWindowMoveSlop);
Log.d(TAG, "finishTouchTracking: mInteractionHandler=" + mInteractionHandler);
Log.d(TAG, "finishTouchTracking: ev=" + ev);
}
boolean isCanceled = ev.getActionMasked() == ACTION_CANCEL;
if (mPassedWindowMoveSlop && mInteractionHandler != null) {
@@ -444,7 +471,14 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
// Since we start touch tracking on DOWN, we may reach this state without actually
// starting the gesture. In that case, we need to clean-up an unfinished or un-started
// animation.
if (DEBUG) {
Log.d(TAG, "finishTouchTracking: mActiveCallbacks=" + mActiveCallbacks);
}
if (mActiveCallbacks != null && mInteractionHandler != null) {
if (DEBUG) {
Log.d(TAG, "finishTouchTracking: isRecentsAnimationRunning="
+ mTaskAnimationManager.isRecentsAnimationRunning());
}
if (mTaskAnimationManager.isRecentsAnimationRunning()) {
// The animation started, but with no movement, in this case, there will be no
// animateToProgress so we have to manually finish here. In the case of
@@ -535,7 +569,13 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
public void onRecentsAnimationStart(RecentsAnimationController controller,
RecentsAnimationTargets targets) {
if (DEBUG) {
Log.d(TAG, "FinishImmediatelyHandler: queuing callback");
}
Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), () -> {
if (DEBUG) {
Log.d(TAG, "FinishImmediatelyHandler: running callback");
}
controller.finish(false /* toRecents */, null);
});
}