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

Commit dea1f612 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Skip default animation of embedded activity for scene transition" into... 

Merge "Skip default animation of embedded activity for scene transition" into udc-dev am: 39169f81 am: 529b9e6c am: 7fde0c60

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



Change-Id: If24ed009a79abaee31b1e0b27e5dda683aa9a4fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f95e7f4 7fde0c60

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

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.wm.shell.activityembedding;



import static android.app.ActivityOptions.ANIM_SCENE_TRANSITION;

import static android.window.TransitionInfo.FLAG_FILLS_TASK;

import static android.window.TransitionInfo.FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY;
@@ -111,6 +112,11 @@ public class ActivityEmbeddingController implements Transitions.TransitionHandle 
        if (containsNonEmbeddedChange && !handleNonEmbeddedChanges(changes)) {

            return false;

        }

        final TransitionInfo.AnimationOptions options = info.getAnimationOptions();

        if (options != null && options.getType() == ANIM_SCENE_TRANSITION) {

            // Scene-transition will be handled by app side.

            return false;

        }



        // Start ActivityEmbedding animation.

        mTransitionCallbacks.put(transition, finishCallback);