Merge "Work around the flicker on enter PiP for foldables" into main

package com.android.wm.shell.unfold;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import android.annotation.NonNull;

import android.app.ActivityManager.RunningTaskInfo;

import android.app.TaskInfo;

import com.android.wm.shell.unfold.ShellUnfoldProgressProvider.UnfoldListener;

import com.android.wm.shell.unfold.animation.UnfoldTaskAnimator;

import dagger.Lazy;

import java.util.List;

import java.util.Optional;

import dagger.Lazy;

/**

 * Manages fold/unfold animations of tasks on foldable devices.

 * When folding or unfolding a foldable device we play animations that

    }

    private void maybeResetTask(UnfoldTaskAnimator animator, TaskInfo taskInfo) {

        if (!mIsInStageChange) {

        // TODO(b/311084698): the windowing mode check is added here as a work around.

        if (!mIsInStageChange || taskInfo.getWindowingMode() == WINDOWING_MODE_PINNED) {

            // No need to resetTask if there is no ongoing state change.

            return;

        }