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

Commit f265be31 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26408988',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26408988', 'googleplex-android-review.googlesource.com/26540244'] into 24Q2-release.

Change-Id: Ica58ba3622740181381b598401c8786e87b84895
parents 8d2c94d1 7fb98d35

quickstep/src/com/android/quickstep/TouchInteractionService.java

+11 −10
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent 
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_DOWN;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_MOVE;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_UP;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.RECENTS_ANIMATION_START_PENDING;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_UNFOLD_ANIMATION_FORWARDER;
@@ -734,15 +733,17 @@ public class TouchInteractionService extends Service { 
        // an ACTION_HOVER_ENTER will fire as well.

        boolean isHoverActionWithoutConsumer = enableCursorHoverStates()

                && isHoverActionWithoutConsumer(event);

        if (mTaskAnimationManager.isRecentsAnimationStartPending()

                && (action == ACTION_DOWN || isHoverActionWithoutConsumer)) {

            ActiveGestureLog.INSTANCE.addLog(

                    new CompoundString("TIS.onInputEvent: ")

                            .append("Cannot process input event: a recents animation has been ")

                            .append("requested, but hasn't started."),

                    RECENTS_ANIMATION_START_PENDING);

            return;

        }



        // TODO(b/285636175): Uncomment this once WM can properly guarantee all animation callbacks

//        if (mTaskAnimationManager.isRecentsAnimationStartPending()

//                && (action == ACTION_DOWN || isHoverActionWithoutConsumer)) {

//            ActiveGestureLog.INSTANCE.addLog(

//                    new CompoundString("TIS.onInputEvent: ")

//                            .append("Cannot process input event: a recents animation has been ")

//                            .append("requested, but hasn't started."),

//                    RECENTS_ANIMATION_START_PENDING);

//            return;

//        }



        SafeCloseable traceToken = TraceHelper.INSTANCE.allowIpcs("TIS.onInputEvent");

quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java

+1 −3
Original line number Diff line number Diff line
@@ -117,9 +117,7 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState 


        setter.setViewBackgroundColor(mActivity.getScrimView(), state.getScrimColor(mActivity),

                config.getInterpolator(ANIM_SCRIM_FADE, LINEAR));



        RecentsState currentState = mActivity.getStateManager().getState();

        if (isSplitSelectionState(state) && !isSplitSelectionState(currentState)) {

        if (isSplitSelectionState(state)) {

            int duration = state.getTransitionDuration(mActivity, true /* isToState */);

            // TODO (b/246851887): Pass in setter as a NO_ANIM PendingAnimation instead

            PendingAnimation pa = new PendingAnimation(duration);