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

Commit 21950c52 authored by Winson Chung's avatar Winson Chung
Browse files

Adding workaround to defer recents animation cancel 

Bug: 126336729
Test: Open gmail, quickly tap home
Change-Id: I98575f0c949ad105c214c6a4a2338a67d1496972
parent 66ae05f1

quickstep/recents_ui_overrides/src/com/android/quickstep/OtherActivityTouchConsumer.java

+16 −4
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ import android.content.Intent; 
import android.graphics.PointF;

import android.graphics.Rect;

import android.os.Build;

import android.os.Handler;

import android.os.Looper;

import android.view.Display;

import android.view.MotionEvent;

import android.view.Surface;
@@ -105,6 +107,12 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC 
    // TODO: Start displacement should have both x and y

    private float mStartDisplacement;



    private Handler mMainThreadHandler;

    private Runnable mCancelRecentsAnimationRunnable = () -> {

        ActivityManagerWrapper.getInstance().cancelRecentsAnimation(

                true /* restoreHomeStackPosition */);

    };



    public OtherActivityTouchConsumer(Context base, RunningTaskInfo runningTaskInfo,

            RecentsModel recentsModel, Intent homeIntent, ActivityControlHelper activityControl,

            boolean isDeferredDownTarget, OverviewCallbacks overviewCallbacks,
@@ -113,6 +121,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC 
            SwipeSharedState swipeSharedState) {

        super(base);



        mMainThreadHandler = new Handler(Looper.getMainLooper());

        mRunningTask = runningTaskInfo;

        mRecentsModel = recentsModel;

        mHomeIntent = homeIntent;
@@ -328,10 +337,12 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC 
            onConsumerAboutToBeSwitched();

            onInteractionGestureFinished();



            // Also clean up in case the system has handled the UP and canceled the animation before

            // we had a chance to start the recents animation. In such a case, we will not receive

            ActivityManagerWrapper.getInstance().cancelRecentsAnimation(

                    true /* restoreHomeStackPosition */);

            // Cancel the recents animation if SysUI happens to handle UP before we have a chance

            // to start the recents animation. In addition, workaround for b/126336729 by delaying

            // the cancel of the animation for a period, in case SysUI is slow to handle UP and we

            // handle DOWN & UP and move the home stack before SysUI can start the activity

            mMainThreadHandler.removeCallbacks(mCancelRecentsAnimationRunnable);

            mMainThreadHandler.postDelayed(mCancelRecentsAnimationRunnable, 100);

        }

        mVelocityTracker.recycle();

        mVelocityTracker = null;
@@ -341,6 +352,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC 
    @Override

    public void onConsumerAboutToBeSwitched() {

        Preconditions.assertUIThread();

        mMainThreadHandler.removeCallbacks(mCancelRecentsAnimationRunnable);

        if (mInteractionHandler != null) {

            // The consumer is being switched while we are active. Set up the shared state to be

            // used by the next animation