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

Commit d2ce88d5 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Ensure that the recents start time is non-zero" into main

parents ad82df4d 90ed0f9b
Loading
Loading
Loading
Loading
+2 −5
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.SET_END_TARGET_NEW_TASK;

import android.content.Intent;
import android.os.SystemClock;
import android.view.MotionEvent;
import android.view.RemoteAnimationTarget;

@@ -182,7 +183,7 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
    private HashMap<Integer, ThumbnailData> mRecentsAnimationCanceledSnapshots;

    /** The time when the swipe up gesture is triggered. */
    private long mSwipeUpStartTimeMs;
    private final long mSwipeUpStartTimeMs = SystemClock.uptimeMillis();

    private boolean mHandlingAtomicEvent;

@@ -508,10 +509,6 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
        return null;
    }

    void setSwipeUpStartTimeMs(long uptimeMs) {
        mSwipeUpStartTimeMs = uptimeMs;
    }

    long getSwipeUpStartTimeMs() {
        return mSwipeUpStartTimeMs;
    }
+0 −1
Original line number Diff line number Diff line
@@ -750,7 +750,6 @@ public class TouchInteractionService extends Service {
                GestureState prevGestureState = new GestureState(mGestureState);
                GestureState newGestureState = createGestureState(mGestureState,
                        getTrackpadGestureType(event));
                newGestureState.setSwipeUpStartTimeMs(SystemClock.uptimeMillis());
                mConsumer.onConsumerAboutToBeSwitched();
                mGestureState = newGestureState;
                mConsumer = newConsumer(prevGestureState, mGestureState, event);