PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Position PiP animation based on actual coordinates

Browse Source 
In the previous patchset, we assumed the left/top to be 0/0 which is not
always the case. This could break, for instance, in ActivityEmbedding
setup, where the pip-ing app is on the left side.

Flag: NONE test fix
Bug: 345327260
Test: Verify with apps support auto-enter PiP such as YouTube
Change-Id: Ic2f3289cf0663d0687d5ccd7f4d0250066cb3f67
This commit is contained in:
Hongwei Wang
2024-06-18 13:43:06 -07:00
parent c9ec536f07
commit cd6172911e
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+21 -16
View File
@@ -164,22 +164,7 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
}
if (sourceRectHint.isEmpty()) {
// Crop a Rect matches the aspect ratio and pivots at the center point.
// To make the animation path simplified.
if ((appBounds.width() / (float) appBounds.height()) > aspectRatio) {
// use the full height.
mSourceRectHint.set(0, 0,
(int) (appBounds.height() * aspectRatio), appBounds.height());
mSourceRectHint.offset(
(appBounds.width() - mSourceRectHint.width()) / 2, 0);
} else {
// use the full width.
mSourceRectHint.set(0, 0,
appBounds.width(), (int) (appBounds.width() / aspectRatio));
mSourceRectHint.offset(
0, (appBounds.height() - mSourceRectHint.height()) / 2);
}
mSourceRectHint.set(getEnterPipWithOverlaySrcRectHint(appBounds, aspectRatio));
// Create a new overlay layer. We do not call detach on this instance, it's propagated
// to other classes like PipTaskOrganizer / RecentsAnimationController to complete
// the cleanup.
@@ -225,6 +210,26 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
addOnUpdateListener(this::onAnimationUpdate);
}
/**
* Crop a Rect matches the aspect ratio and pivots at the center point.
*/
private Rect getEnterPipWithOverlaySrcRectHint(Rect appBounds, float aspectRatio) {
final float appBoundsAspectRatio = appBounds.width() / (float) appBounds.height();
final int width, height;
int left = appBounds.left;
int top = appBounds.top;
if (appBoundsAspectRatio < aspectRatio) {
width = appBounds.width();
height = (int) (width / aspectRatio);
top = appBounds.top + (appBounds.height() - height) / 2;
} else {
height = appBounds.height();
width = (int) (height * aspectRatio);
left = appBounds.left + (appBounds.width() - width) / 2;
}
return new Rect(left, top, left + width, top + height);
}
private void onAnimationUpdate(RectF currentRect, float progress) {
if (mHasAnimationEnded) return;
final SurfaceControl.Transaction tx =