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

Commit 4b5b5d05 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Polish ActivityEmbedding Shell animation when open a split pair" into... 

Merge "Polish ActivityEmbedding Shell animation when open a split pair" into tm-qpr-dev am: fcfa5004 am: c5dfcc89

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



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

libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java

+2 −1
Original line number Diff line number Diff line
@@ -285,7 +285,8 @@ class ActivityEmbeddingAnimationRunner { 
            }



            final Animation animation;

            if (!TransitionInfo.isIndependent(change, info)) {

            if (change.getParent() != null

                    && handledChanges.contains(info.getChange(change.getParent()))) {

                // No-op if it will be covered by the changing parent window.

                animation = ActivityEmbeddingAnimationSpec.createNoopAnimation(change);

            } else if (Transitions.isClosingType(change.getMode())) {