Merge "Remove duplicate call to update PIP bounds on PIP expand" into sc-dev
This commit is contained in:
@@ -202,6 +202,7 @@ public class PhonePipMenuController implements PipMenuController {
|
|||||||
mSystemWindows.updateViewLayout(mPipMenuView,
|
mSystemWindows.updateViewLayout(mPipMenuView,
|
||||||
getPipMenuLayoutParams(MENU_WINDOW_TITLE, destinationBounds.width(),
|
getPipMenuLayoutParams(MENU_WINDOW_TITLE, destinationBounds.width(),
|
||||||
destinationBounds.height()));
|
destinationBounds.height()));
|
||||||
|
updateMenuLayout(destinationBounds);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -684,7 +684,7 @@ public class PipMotionHelper implements PipAppOpsListener.Callback,
|
|||||||
// Intentionally resize here even if the current bounds match the destination bounds.
|
// Intentionally resize here even if the current bounds match the destination bounds.
|
||||||
// This is so all the proper callbacks are performed.
|
// This is so all the proper callbacks are performed.
|
||||||
mPipTaskOrganizer.scheduleAnimateResizePip(toBounds, duration,
|
mPipTaskOrganizer.scheduleAnimateResizePip(toBounds, duration,
|
||||||
TRANSITION_DIRECTION_EXPAND_OR_UNEXPAND, mUpdateBoundsCallback);
|
TRANSITION_DIRECTION_EXPAND_OR_UNEXPAND, null /* updateBoundsCallback */);
|
||||||
setAnimatingToBounds(toBounds);
|
setAnimatingToBounds(toBounds);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user