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

Merge "Handle ActivityEmbedding container in remote transition adapter" into tm-qpr-dev am: ed1949c971

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

Change-Id: I3696bcede29fbc12e77c1e438310b495be600cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-12-02 18:21:59 +00:00
committed by Automerger Merge Worker
parent 2b33756547 ed1949c971
commit e418cf34da
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/animation/src/com/android/systemui/animation/RemoteTransitionAdapter.kt
View File

@@ -195,8 +195,16 @@ class RemoteTransitionAdapter {
val out = ArrayList<RemoteAnimationTarget>() val out = ArrayList<RemoteAnimationTarget>()
for (i in info.changes.indices) { for (i in info.changes.indices) {
val change = info.changes[i] val change = info.changes[i]
val changeIsWallpaper = change.flags and TransitionInfo.FLAG_IS_WALLPAPER != 0 if (change.hasFlags(TransitionInfo.FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY)) {
if (wallpapers != changeIsWallpaper) continue // For embedded container, when the parent Task is also in the transition, we
// should only animate the parent Task.
if (change.parent != null) continue
// For embedded container without parent, we should only animate if it fills
// the Task. Otherwise we may animate only partial of the Task.
if (!change.hasFlags(TransitionInfo.FLAG_FILLS_TASK)) continue
}
// Check if it is wallpaper
if (wallpapers != change.hasFlags(TransitionInfo.FLAG_IS_WALLPAPER)) continue
out.add(createTarget(change, info.changes.size - i, info, t)) out.add(createTarget(change, info.changes.size - i, info, t))
if (leashMap != null) { if (leashMap != null) {
leashMap[change.leash] = out[out.size - 1].leash leashMap[change.leash] = out[out.size - 1].leash