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

Commit d69e15ad authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Only execute relayout after animation is over"

parents 3a4e97db 5cfcf44e

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

+13 −8
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ import com.android.keyguard.KeyguardViewController; 
import com.android.keyguard.ViewMediatorCallback;

import com.android.keyguard.mediator.ScreenOnCoordinator;

import com.android.systemui.CoreStartable;

import com.android.systemui.DejankUtils;

import com.android.systemui.Dumpable;

import com.android.systemui.animation.Interpolators;

import com.android.systemui.broadcast.BroadcastDispatcher;
@@ -2345,6 +2346,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
        // Block the panel from expanding, in case we were doing a swipe to dismiss gesture.

        mKeyguardViewControllerLazy.get().blockPanelExpansionFromCurrentTouch();

        final boolean wasShowing = mShowing;

        InteractionJankMonitor.getInstance().end(CUJ_LOCKSCREEN_UNLOCK_ANIMATION);



        // Post layout changes to the next frame, so we don't hang at the end of the animation.

        DejankUtils.postAfterTraversal(() -> {

            onKeyguardExitFinished();



            if (mKeyguardStateController.isDismissingFromSwipe() || wasShowing) {
@@ -2354,7 +2359,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
            finishSurfaceBehindRemoteAnimation(cancelled);

            mSurfaceBehindRemoteAnimationRequested = false;

            mKeyguardUnlockAnimationControllerLazy.get().notifyFinishedKeyguardExitAnimation();

        InteractionJankMonitor.getInstance().end(CUJ_LOCKSCREEN_UNLOCK_ANIMATION);

        });

    }



    /**