Merge "Skip setting up ui if the handler is already invalidated" into sc-dev

This commit is contained in:
Winson Chung
2021-05-13 17:28:06 +00:00
committed by Android (Google) Code Review
2 changed files with 8 additions and 0 deletions

View File

@@ -1520,6 +1520,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
protected abstract void finishRecentsControllerToHome(Runnable callback);
private void setupLauncherUiAfterSwipeUpToRecentsAnimation() {
if (mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) {
return;
}
endLauncherTransitionController();
mRecentsView.onSwipeUpAnimationSuccess();
if (LIVE_TILE.get()) {

View File

@@ -57,6 +57,11 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
@Override
public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
if (mLastGestureState == null) {
ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
mLiveTileRestartListener);
return;
}
BaseActivityInterface activityInterface = mLastGestureState.getActivityInterface();
if (LIVE_TILE.get() && activityInterface.isInLiveTileMode()
&& activityInterface.getCreatedActivity() != null) {