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

Commit dd497285 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Only manipulate leashes for leaf-tasks when adapting to legacy" into... 

Merge "Only manipulate leashes for leaf-tasks when adapting to legacy" into tm-qpr-dev am: 4c287406

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



Change-Id: I3286186efd46d57add45b29a7ac43d58e26b3f60
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 180e4140 4c287406

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationAdapterCompat.java

+4 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ public class RemoteAnimationAdapterCompat { 
                float displayH = 0;

                for (int i = info.getChanges().size() - 1; i >= 0; --i) {

                    final TransitionInfo.Change change = info.getChanges().get(i);

                    // skip changes that we didn't wrap

                    if (!leashMap.containsKey(change.getLeash())) continue;

                    if (change.getTaskInfo() != null

                            && change.getTaskInfo().getActivityType() == ACTIVITY_TYPE_HOME) {

                        isReturnToHome = change.getMode() == TRANSIT_OPEN
@@ -173,6 +175,8 @@ public class RemoteAnimationAdapterCompat { 
                    for (int i = info.getChanges().size() - 1; i >= 0; --i) {

                        final TransitionInfo.Change change = info.getChanges().get(i);

                        final SurfaceControl leash = leashMap.get(change.getLeash());

                        // skip changes that we didn't wrap

                        if (leash == null) continue;

                        final int mode = info.getChanges().get(i).getMode();

                        // Only deal with independent layers

                        if (!TransitionInfo.isIndependent(change, info)) continue;