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

Merge "Skip default animation of embedded activity for scene transition" into udc-dev am: 39169f8115 am: 529b9e6cca

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

Change-Id: Ifd7a351e175bc98d573779db936b0d77d9a2c84b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2023-05-22 08:21:31 +00:00
committed by Automerger Merge Worker
parent 60a2af1ea8 529b9e6cca
commit 0af24881d4
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package com.android.wm.shell.activityembedding; 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_FILLS_TASK;
import static android.window.TransitionInfo.FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY; 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)) { if (containsNonEmbeddedChange && !handleNonEmbeddedChanges(changes)) {
return false; 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. // Start ActivityEmbedding animation.
mTransitionCallbacks.put(transition, finishCallback); mTransitionCallbacks.put(transition, finishCallback);