Merge "Revert "Finish recents animation on activity destroyed."" into tm-dev

This commit is contained in:
Alex Chau
2022-06-22 11:59:31 +00:00
committed by Android (Google) Code Review

View File

@@ -166,11 +166,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
if (mActivity != activity) {
return;
}
if (mTaskAnimationManager != null) {
mTaskAnimationManager.finishRunningRecentsAnimation(true);
}
mRecentsView = null;
mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
mActivity = null;
}
};
@@ -1599,6 +1595,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
private void reset() {
mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);
if (mActivity != null) {
mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
}
}
/**