Merge "Do not offset PiP when auto-enter-pip is ongoing" into tm-dev am: d05dbf68b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18357116 Change-Id: I9767b469e021e374368c2a6c9df00f9344de7d79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1292,7 +1292,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
|
|||||||
*/
|
*/
|
||||||
public void scheduleOffsetPip(Rect originalBounds, int offset, int duration,
|
public void scheduleOffsetPip(Rect originalBounds, int offset, int duration,
|
||||||
Consumer<Rect> updateBoundsCallback) {
|
Consumer<Rect> updateBoundsCallback) {
|
||||||
if (mPipTransitionState.shouldBlockResizeRequest()) {
|
if (mPipTransitionState.shouldBlockResizeRequest()
|
||||||
|
|| mPipTransitionState.getInSwipePipToHomeTransition()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (mWaitForFixedRotation) {
|
if (mWaitForFixedRotation) {
|
||||||
|
|||||||
Reference in New Issue
Block a user