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

Commit 2ef27197 authored by Winson Chung's avatar Winson Chung
Browse files

Fix issue with swipe up canceling recents animation. 

- Only cancel the animation if handling the button, in that case,
  FLAG_CANCELED is not set (we were previously also only falling into this
  block to cancel the animatino in KeyButtonView)

Bug: 78660363
Test: Swipe up over back button, ensure we still enter quickstep
Change-Id: I038adcbd6c4b4ffda28dd86151c855eed04f5e0d
parent 27f81888

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -6094,7 +6094,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        // Cancel any pending remote recents animations before handling the button itself. In the

        // case where we are going home and the recents animation has already started, just cancel

        // the recents animation, leaving the home stack in place for the pending start activity

        if (isNavBarVirtKey && !down) {

        if (isNavBarVirtKey && !down && !canceled) {

            boolean isHomeKey = keyCode == KeyEvent.KEYCODE_HOME;

            mActivityManagerInternal.cancelRecentsAnimation(!isHomeKey);

        }