Merge "Revert "Finish recents animation on activity destroyed."" into tm-dev
This commit is contained in:
@@ -166,11 +166,7 @@ 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;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -1599,6 +1595,9 @@ 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