Merge "Finish recents animation on activity destroyed." into tm-dev am: d44f9c9741 am: 3664e04036
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17943734 Change-Id: I4b204448338506e150fbf50be226c440b469d6e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -163,7 +163,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
|||||||
if (mActivity != activity) {
|
if (mActivity != activity) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (mTaskAnimationManager != null) {
|
||||||
|
mTaskAnimationManager.finishRunningRecentsAnimation(true);
|
||||||
|
}
|
||||||
mRecentsView = null;
|
mRecentsView = null;
|
||||||
|
mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
|
||||||
mActivity = null;
|
mActivity = null;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -1571,9 +1575,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
|||||||
|
|
||||||
private void reset() {
|
private void reset() {
|
||||||
mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);
|
mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);
|
||||||
if (mActivity != null) {
|
|
||||||
mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user