mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-19 10:48:19 +00:00
Merge "Load home properly even if AllSetActivity fails Go To Home Swipe." into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
d01497d714
@@ -20,6 +20,7 @@ import static com.android.launcher3.touch.BaseSwipeDetector.calculateDuration;
|
||||
import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_POSITIVE;
|
||||
import static com.android.launcher3.touch.SingleAxisSwipeDetector.VERTICAL;
|
||||
import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
|
||||
import static com.android.quickstep.OverviewComponentObserver.startHomeIntentSafely;
|
||||
import static com.android.quickstep.util.ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID;
|
||||
|
||||
import android.animation.ObjectAnimator;
|
||||
@@ -102,8 +103,7 @@ public class ProgressDelegateInputConsumer implements InputConsumer,
|
||||
mStateCallback = new MultiStateCallback(STATE_NAMES);
|
||||
mStateCallback.runOnceAtState(STATE_TARGET_RECEIVED | STATE_HANDLER_INVALIDATED,
|
||||
this::endRemoteAnimation);
|
||||
mStateCallback.runOnceAtState(STATE_TARGET_RECEIVED | STATE_FLING_FINISHED,
|
||||
this::onFlingFinished);
|
||||
mStateCallback.runOnceAtState(STATE_FLING_FINISHED, this::onFlingFinished);
|
||||
|
||||
mSwipeDetector = new SingleAxisSwipeDetector(mContext, this, VERTICAL);
|
||||
mSwipeDetector.setDetectableScrollConditions(DIRECTION_POSITIVE, false);
|
||||
@@ -159,10 +159,12 @@ public class ProgressDelegateInputConsumer implements InputConsumer,
|
||||
}
|
||||
|
||||
private void onFlingFinished() {
|
||||
boolean endToRecents = mFlingEndsOnHome == null ? true : mFlingEndsOnHome;
|
||||
if (mRecentsAnimationController != null) {
|
||||
boolean endToRecents = mFlingEndsOnHome == null ? true : mFlingEndsOnHome;
|
||||
mRecentsAnimationController.finishController(endToRecents /* toRecents */,
|
||||
null /* callback */, false /* sendUserLeaveHint */);
|
||||
} else if (endToRecents) {
|
||||
startHomeIntentSafely(mContext, null);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user