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

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

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

Change-Id: I09100cbc42a9299c05919a89fb967e267b896b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jeff Chang
2023-04-13 13:57:54 +00:00
committed by Automerger Merge Worker
parent df4b2fe1da c2b50738a6
commit d4f077274e
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,6 @@ import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator; import android.animation.ValueAnimator;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.graphics.Point;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.IBinder; import android.os.IBinder;
import android.view.SurfaceControl; import android.view.SurfaceControl;
@@ -139,20 +138,13 @@ class SplitScreenTransitions {
t.setAlpha(parentChange.getLeash(), 1.f); t.setAlpha(parentChange.getLeash(), 1.f);
// and then animate this layer outside the parent (since, for example, this is // and then animate this layer outside the parent (since, for example, this is
// the home task animating from fullscreen to part-screen). // the home task animating from fullscreen to part-screen).
t.reparent(leash, info.getRoot(rootIdx).getLeash()); t.reparent(parentChange.getLeash(), info.getRoot(rootIdx).getLeash());
t.setLayer(leash, info.getChanges().size() - i); t.setLayer(parentChange.getLeash(), info.getChanges().size() - i);
// build the finish reparent/reposition // build the finish reparent/reposition
mFinishTransaction.reparent(leash, parentChange.getLeash()); mFinishTransaction.reparent(leash, parentChange.getLeash());
mFinishTransaction.setPosition(leash, mFinishTransaction.setPosition(leash,
change.getEndRelOffset().x, change.getEndRelOffset().y); 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 boolean isRootOrSplitSideRoot = change.getParent() == null
|| topRoot.equals(change.getParent()); || topRoot.equals(change.getParent());