Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1df2f2f7 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Align drag to split transition with legacy transition" into udc-dev am:... 

Merge "Align drag to split transition with legacy transition" into udc-dev am: c2b50738 am: d4f07727

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22548844



Change-Id: I681823679ff86cf8ab6ba0676a0660381dafe15f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d16b8f85 d4f07727

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java

+2 −10
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.animation.AnimatorListenerAdapter; 
import android.animation.ValueAnimator;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.graphics.Point;

import android.graphics.Rect;

import android.os.IBinder;

import android.view.SurfaceControl;
@@ -139,20 +138,13 @@ class SplitScreenTransitions { 
                    t.setAlpha(parentChange.getLeash(), 1.f);

                    // and then animate this layer outside the parent (since, for example, this is

                    // the home task animating from fullscreen to part-screen).

                    t.reparent(leash, info.getRoot(rootIdx).getLeash());

                    t.setLayer(leash, info.getChanges().size() - i);

                    t.reparent(parentChange.getLeash(), info.getRoot(rootIdx).getLeash());

                    t.setLayer(parentChange.getLeash(), info.getChanges().size() - i);

                    // build the finish reparent/reposition

                    mFinishTransaction.reparent(leash, parentChange.getLeash());

                    mFinishTransaction.setPosition(leash,

                            change.getEndRelOffset().x, change.getEndRelOffset().y);

                }

                // TODO(shell-transitions): screenshot here

                final Rect startBounds = new Rect(change.getStartAbsBounds());

                final Rect endBounds = new Rect(change.getEndAbsBounds());

                final Point rootOffset = info.getRoot(rootIdx).getOffset();

                startBounds.offset(-rootOffset.x, -rootOffset.y);

                endBounds.offset(-rootOffset.x, -rootOffset.y);

                startExampleResizeAnimation(leash, startBounds, endBounds);

            }

            boolean isRootOrSplitSideRoot = change.getParent() == null

                    || topRoot.equals(change.getParent());