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

Commit a3989e34 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Avoid wrapping the display change leash to Keyguard unlock animation"... 

Merge "Avoid wrapping the display change leash to Keyguard unlock animation" into udc-dev am: 9f41a7a2 am: d8693486

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



Change-Id: Ibf292c24b1eff14e44b7f607a23474aaa9ce8349
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c81ee71 d8693486

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java

+4 −0
Original line number Diff line number Diff line
@@ -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,