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

Commit 532b962a authored by Tony Wickham's avatar Tony Wickham
Browse files

resolve merge conflicts of 107fe60f to ub-launcher3-master

Change-Id: I9a1c52e66edd627fd54cc3cb423fa28a6175f8ac
parents 87be28a6 107fe60f
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -165,6 +165,11 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch

        mMotionPauseDetector.clear();
        mNormalToHintOverviewScrimAnimator = null;
        if (mLauncher.isInState(OVERVIEW)) {
            // Normally we would cleanup the state based on mCurrentAnimation, but since we stop
            // using that when we pause to go to Overview, we need to clean up ourselves.
            clearState();
        }
    }

    @Override