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

Merge "Fix issues related to clip rect used in animations" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-06-02 18:34:41 +00:00
committed by Android (Google) Code Review
parent 48bab40d62 dd6a3351ba
commit 1c9eb9fcfc
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java
View File

@@ -472,8 +472,9 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler {
} }
final Rect clipRect = Transitions.isClosingType(change.getMode()) final Rect clipRect = Transitions.isClosingType(change.getMode())
? mRotator.getEndBoundsInStartRotation(change) ? new Rect(mRotator.getEndBoundsInStartRotation(change))
: change.getEndAbsBounds(); : new Rect(change.getEndAbsBounds());
clipRect.offsetTo(0, 0);
if (delayedEdgeExtension) { if (delayedEdgeExtension) {
// If the edge extension needs to happen after the startTransition has been // If the edge extension needs to happen after the startTransition has been
@@ -973,7 +974,7 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler {
private static void applyTransformation(long time, SurfaceControl.Transaction t, private static void applyTransformation(long time, SurfaceControl.Transaction t,
SurfaceControl leash, Animation anim, Transformation transformation, float[] matrix, SurfaceControl leash, Animation anim, Transformation transformation, float[] matrix,
Point position, float cornerRadius, @Nullable Rect clipRect) { Point position, float cornerRadius, @Nullable Rect immutableClipRect) {
anim.getTransformation(time, transformation); anim.getTransformation(time, transformation);
if (position != null) { if (position != null) {
transformation.getMatrix().postTranslate(position.x, position.y); transformation.getMatrix().postTranslate(position.x, position.y);
@@ -981,6 +982,7 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler {
t.setMatrix(leash, transformation.getMatrix(), matrix); t.setMatrix(leash, transformation.getMatrix(), matrix);
t.setAlpha(leash, transformation.getAlpha()); t.setAlpha(leash, transformation.getAlpha());
final Rect clipRect = immutableClipRect == null ? null : new Rect(immutableClipRect);
Insets extensionInsets = Insets.min(transformation.getInsets(), Insets.NONE); Insets extensionInsets = Insets.min(transformation.getInsets(), Insets.NONE);
if (!extensionInsets.equals(Insets.NONE) && clipRect != null && !clipRect.isEmpty()) { if (!extensionInsets.equals(Insets.NONE) && clipRect != null && !clipRect.isEmpty()) {
// Clip out any overflowing edge extension // Clip out any overflowing edge extension