From 205a99ebf602b69399f9406191266979314a8913 Mon Sep 17 00:00:00 2001 From: Ming-Shin Lu Date: Tue, 23 May 2023 17:06:36 +0000 Subject: [PATCH] Avoid wrapping the display change leash to Keyguard unlock animation ..., in case the animating root task being occluded by this change. Also skip other non-tasks and non-wallpaper changes as they don't need to animate for keyguard unlock animation. See: http://recall/-/bN53iXCwu0DIehsmJlTyWk/eefM8O857S8JUBJmQCieKK Bug: 283963801 Test: manual by issue steps: 1) Launch apps to enter split-screen mode 2) Turn off/on the screen with power key to show the lockscreen 3) Rotate the device in landscape 4) Swipe up to dismiss the lockscreen 5) Expect the split-tasks animates fade-in without seeing a weird cross-fade out animation on top of the split-tasks Change-Id: I261e081b1cb0bd17d0523e2c80368a669a6246d6 --- .../src/com/android/systemui/keyguard/KeyguardService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index b8d3121518e99..71fbaf432ea22 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -122,6 +122,10 @@ public class KeyguardService extends Service { } } + // Avoid wrapping non-task and non-wallpaper changes as they don't need to animate + // for keyguard unlock animation. + if (taskId < 0 && !wallpapers) continue; + final RemoteAnimationTarget target = TransitionUtil.newTarget(change, // wallpapers go into the "below" layer space info.getChanges().size() - i,