Merge "Do not offset PiP when auto-enter-pip is ongoing" into tm-dev am: d05dbf68b1 am: 4ef0a619dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18357116

Change-Id: I6622b8ba90407ba781a750f2a14b1561d382a7ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2022-05-13 01:33:32 +00:00
committed by Automerger Merge Worker

View File

@@ -1296,7 +1296,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
*/
public void scheduleOffsetPip(Rect originalBounds, int offset, int duration,
Consumer<Rect> updateBoundsCallback) {
if (mPipTransitionState.shouldBlockResizeRequest()) {
if (mPipTransitionState.shouldBlockResizeRequest()
|| mPipTransitionState.getInSwipePipToHomeTransition()) {
return;
}
if (mWaitForFixedRotation) {