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

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

Merge "Play over-keyguard transitions in default handler" into udc-dev am:... 

Merge "Play over-keyguard transitions in default handler" into udc-dev am: 65281547 am: 86f208ac

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



Change-Id: I9d126d00271dcb9353c7056d14191379e3b23930
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b99e5ae 86f208ac

libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java

+13 −8
Original line number Diff line number Diff line
@@ -121,21 +121,21 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler 
        }



        boolean hasOpeningOcclude = false;

        boolean hasClosingOcclude = false;

        boolean hasOpeningDream = false;

        boolean hasClosingApp = false;



        // Check for occluding/dream/closing apps

        for (int i = info.getChanges().size() - 1; i >= 0; i--) {

            final TransitionInfo.Change change = info.getChanges().get(i);

            if (isOpeningType(change.getMode())) {

                if (change.hasFlags(FLAG_OCCLUDES_KEYGUARD)) {

                    hasOpeningOcclude = true;

                }

                if (change.getTaskInfo() != null

                        && change.getTaskInfo().getActivityType() == ACTIVITY_TYPE_DREAM) {

                    hasOpeningDream = true;

                }

            if ((change.getFlags() & TransitionInfo.FLAG_IS_WALLPAPER) != 0) {

                continue;

            } else if (isOpeningType(change.getMode())) {

                hasOpeningOcclude |= change.hasFlags(FLAG_OCCLUDES_KEYGUARD);

                hasOpeningDream |= (change.getTaskInfo() != null

                        && change.getTaskInfo().getActivityType() == ACTIVITY_TYPE_DREAM);

            } else if (isClosingType(change.getMode())) {

                hasClosingOcclude |= change.hasFlags(FLAG_OCCLUDES_KEYGUARD);

                hasClosingApp = true;

            }

        }
@@ -147,6 +147,11 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler 
                    transition, info, startTransaction, finishTransaction, finishCallback);

        }

        if (hasOpeningOcclude || info.getType() == TRANSIT_KEYGUARD_OCCLUDE) {

            if (hasClosingOcclude) {

                // Transitions between apps on top of the keyguard can use the default handler.

                // WM sends a final occlude status update after the transition is finished.

                return false;

            }

            if (hasOpeningDream) {

                return startAnimation(mOccludeByDreamTransition,

                        "occlude-by-dream",