Merge "Skip calling into recents view if the activity is not yet initialized" into ub-launcher3-master

This commit is contained in:
Winson Chung 2019-11-07 03:42:08 +00:00 committed by Android (Google) Code Review
commit 5bdae3d869
1 changed files with 3 additions and 1 deletions

View File

@ -615,7 +615,9 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity>
@Override
public void onRecentsAnimationCanceled(ThumbnailData thumbnailData) {
super.onRecentsAnimationCanceled(thumbnailData);
mRecentsView.setRecentsAnimationTargets(null, null);
if (mRecentsView != null) {
mRecentsView.setRecentsAnimationTargets(null, null);
}
mActivityInitListener.unregister();
mStateCallback.setStateOnUiThread(STATE_GESTURE_CANCELLED | STATE_HANDLER_INVALIDATED);
ActiveGestureLog.INSTANCE.addLog("cancelRecentsAnimation");