Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use out pipBounds to save reentry size"

Browse Source
This commit is contained in:
Jorge Gil
2020-10-12 16:55:50 +00:00
committed by Android (Google) Code Review
parent 8f8021344e a6e524e127
commit 5570588154
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
View File

@@ -61,7 +61,6 @@ public class PipController implements Pip, PipTaskOrganizer.PipTransitionCallbac
private final DisplayInfo mTmpDisplayInfo = new DisplayInfo(); private final DisplayInfo mTmpDisplayInfo = new DisplayInfo();
private final Rect mTmpInsetBounds = new Rect(); private final Rect mTmpInsetBounds = new Rect();
private final Rect mTmpNormalBounds = new Rect(); private final Rect mTmpNormalBounds = new Rect();
protected final Rect mReentryBounds = new Rect();
private DisplayController mDisplayController; private DisplayController mDisplayController;
private PipAppOpsListener mAppOpsListener; private PipAppOpsListener mAppOpsListener;
@@ -396,8 +395,7 @@ public class PipController implements Pip, PipTaskOrganizer.PipTransitionCallbac
public void onPipTransitionStarted(ComponentName activity, int direction, Rect pipBounds) { public void onPipTransitionStarted(ComponentName activity, int direction, Rect pipBounds) {
if (isOutPipDirection(direction)) { if (isOutPipDirection(direction)) {
// Exiting PIP, save the reentry bounds to restore to when re-entering. // Exiting PIP, save the reentry bounds to restore to when re-entering.
updateReentryBounds(pipBounds); mPipBoundsHandler.onSaveReentryBounds(activity, pipBounds);
mPipBoundsHandler.onSaveReentryBounds(activity, mReentryBounds);
} }
// Disable touches while the animation is running // Disable touches while the animation is running
mTouchHandler.setTouchEnabled(false); mTouchHandler.setTouchEnabled(false);
@@ -406,16 +404,6 @@ public class PipController implements Pip, PipTaskOrganizer.PipTransitionCallbac
} }
} }
/**
* Update the bounds used to save the re-entry size and snap fraction when exiting PIP.
*/
public void updateReentryBounds(Rect bounds) {
final Rect reentryBounds = mTouchHandler.getUserResizeBounds();
float snapFraction = mPipBoundsHandler.getSnapFraction(bounds);
mPipBoundsHandler.applySnapFraction(reentryBounds, snapFraction);
mReentryBounds.set(reentryBounds);
}
@Override @Override
public void onPipTransitionFinished(ComponentName activity, int direction) { public void onPipTransitionFinished(ComponentName activity, int direction) {
onPipTransitionFinishedOrCanceled(direction); onPipTransitionFinishedOrCanceled(direction);