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

Commit ab968901 authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Remove dream when keyguard going away 

The old removal method by doing it in handleRequest won't work as the
shell initiated transition is expected to have everything in WCT ready
before start, and the handleRequest will never be called.

Thus, to properly remove the dream in the same WCT, include it before
start the transition.

Bug: 364930619
Test: Dream is properly removed when the flag is enabled
Flag: com.android.window.flags.ensure_keyguard_does_transition_starting
Change-Id: I7c31dd9a2c83d43a77464c89776b3d8475e243f4
parent 76979804

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

+8 −0
Original line number Diff line number Diff line
@@ -448,6 +448,14 @@ public class KeyguardTransitionHandler 
            final WindowContainerTransaction wct = new WindowContainerTransaction();

            wct.addKeyguardState(new KeyguardState.Builder().setKeyguardShowing(keyguardShowing)

                    .setAodShowing(aodShowing).build());



            if (ENABLE_NEW_KEYGUARD_SHELL_TRANSITIONS && dismissDreamOnKeyguardDismiss()

                    && !keyguardShowing && mDreamToken != null) {

                // Dismiss the dream in the same transaction, so that it isn't visible once the

                // device is unlocked.

                wct.removeTask(mDreamToken);

            }



            mMainExecutor.execute(() -> {

                mTransitions.startTransition(keyguardShowing ? TRANSIT_TO_FRONT : TRANSIT_TO_BACK,

                        wct, KeyguardTransitionHandler.this);