Merge "Comply with the IRecentsAnimationController change" into sc-dev

This commit is contained in:
Hongwei Wang
2021-04-23 05:17:12 +00:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 10 deletions
@@ -1509,9 +1509,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
SystemUiProxy.INSTANCE.get(mContext).stopSwipePipToHome(
mSwipePipToHomeAnimator.getComponentName(),
mSwipePipToHomeAnimator.getDestinationBounds());
mRecentsAnimationController.setFinishTaskBounds(
mRecentsAnimationController.setFinishTaskTransaction(
mSwipePipToHomeAnimator.getTaskId(),
mSwipePipToHomeAnimator.getDestinationBounds(),
mSwipePipToHomeAnimator.getFinishTransaction());
mIsSwipingPipToHome = false;
}
@@ -19,7 +19,6 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;
import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
import android.graphics.Rect;
import android.window.PictureInPictureSurfaceTransaction;
import androidx.annotation.NonNull;
@@ -145,18 +144,16 @@ public class RecentsAnimationController {
}
/**
* Sets the final bounds on a Task. This is used by Launcher to notify the system that
* animating Activity to PiP has completed and the associated task surface should be updated
* accordingly. This should be called before `finish`
* Sets the final surface transaction on a Task. This is used by Launcher to notify the system
* that animating Activity to PiP has completed and the associated task surface should be
* updated accordingly. This should be called before `finish`
* @param taskId for which the leash should be updated
* @param destinationBounds bounds of the final PiP window
* @param finishTransaction leash operations for the final transform.
*/
public void setFinishTaskBounds(int taskId, Rect destinationBounds,
public void setFinishTaskTransaction(int taskId,
PictureInPictureSurfaceTransaction finishTransaction) {
UI_HELPER_EXECUTOR.execute(
() -> mController.setFinishTaskBounds(taskId, destinationBounds,
finishTransaction));
() -> mController.setFinishTaskTransaction(taskId, finishTransaction));
}
/**