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

Commit 06274076 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Clear un-sent pending animation if back gesture is complete finished." into main

parents 647dbb62 59e9754a
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
@@ -1591,7 +1591,6 @@ class BackNavigationController {

    private static void setLaunchBehind(@NonNull ActivityRecord activity) {
        if (!activity.isVisibleRequested()) {
            activity.setVisibility(true);
            // The transition could commit the visibility and in the finishing state, that could
            // skip commitVisibility call in setVisibility cause the activity won't visible here.
            // Call it again to make sure the activity could be visible while handling the pending
@@ -1669,11 +1668,15 @@ class BackNavigationController {
        ProtoLog.d(WM_DEBUG_BACK_PREVIEW, "onBackNavigationDone backType=%s, "
                + "triggerBack=%b", backType, triggerBack);

        synchronized (mWindowManagerService.mGlobalLock) {
            mNavigationMonitor.stopMonitorForRemote();
            mBackAnimationInProgress = false;
            mShowWallpaper = false;
            // All animation should be done, clear any un-send animation.
            mPendingAnimation = null;
            mPendingAnimationBuilder = null;
        }
    }

    static TaskSnapshot getSnapshot(@NonNull WindowContainer w,
            ActivityRecord[] visibleOpenActivities) {