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

Commit 48ba8c86 authored by Winson Chung's avatar Winson Chung
Browse files

Fix regression in assistant window handling 

- Skip the assistant as the running task when handling swipe up
- Also ensure that we fall into the overview input consumer if we are
  swiping it from the assistant over home
- Skip accounting for the scroll offset when there is no running task

Bug: 136282913
Change-Id: I28e45e407702d6d6aebaa0232cd96ccb10047644
parent 3ab3c768

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

+24 −3
Original line number Diff line number Diff line
@@ -33,11 +33,13 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_N 
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;

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

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

import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_ASSISTANT;



import android.annotation.TargetApi;

import android.app.ActivityManager;

import android.app.ActivityManager.RunningTaskInfo;

import android.app.Service;

import android.app.TaskInfo;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;
@@ -102,6 +104,7 @@ import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; 
import com.android.systemui.shared.system.RecentsAnimationListener;

import com.android.systemui.shared.system.SystemGestureExclusionListenerCompat;



import com.android.systemui.shared.system.TaskInfoCompat;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.Arrays;
@@ -566,7 +569,7 @@ public class TouchInteractionService extends Service implements 
            if (isInValidSystemUiState) {

                // This handles apps launched in direct boot mode (e.g. dialer) as well as apps

                // launched while device is locked even after exiting direct boot mode (e.g. camera).

                return createDeviceLockedInputConsumer(mAM.getRunningTask(0));

                return createDeviceLockedInputConsumer(mAM.getRunningTask(ACTIVITY_TYPE_ASSISTANT));

            } else {

                return mResetGestureInputConsumer;

            }
@@ -604,7 +607,7 @@ public class TouchInteractionService extends Service implements 
    }



    private InputConsumer newBaseConsumer(boolean useSharedState, MotionEvent event) {

        final RunningTaskInfo runningTaskInfo = mAM.getRunningTask(0);

        RunningTaskInfo runningTaskInfo = mAM.getRunningTask(0);

        if (!useSharedState) {

            sSwipeSharedState.clearAllState(false /* finishAnimation */);

        }
@@ -616,6 +619,17 @@ public class TouchInteractionService extends Service implements 
        final ActivityControlHelper activityControl =

                mOverviewComponentObserver.getActivityControlHelper();



        boolean forceOverviewInputConsumer = false;

        if (isExcludedAssistant(runningTaskInfo)) {

            // In the case where we are in the excluded assistant state, ignore it and treat the

            // running activity as the task behind the assistant

            runningTaskInfo = mAM.getRunningTask(ACTIVITY_TYPE_ASSISTANT);

            final ComponentName homeComponent =

                    mOverviewComponentObserver.getHomeIntent().getComponent();

            forceOverviewInputConsumer =

                    runningTaskInfo.baseIntent.getComponent().equals(homeComponent);

        }



        if (runningTaskInfo == null && !sSwipeSharedState.goingToLauncher

                && !sSwipeSharedState.recentsAnimationFinishInterrupted) {

            return mResetGestureInputConsumer;
@@ -625,7 +639,8 @@ public class TouchInteractionService extends Service implements 
            RunningTaskInfo info = new ActivityManager.RunningTaskInfo();

            info.id = sSwipeSharedState.nextRunningTaskId;

            return createOtherActivityInputConsumer(event, info);

        } else if (sSwipeSharedState.goingToLauncher || activityControl.isResumed()) {

        } else if (sSwipeSharedState.goingToLauncher || activityControl.isResumed()

                || forceOverviewInputConsumer) {

            return createOverviewInputConsumer(event);

        } else if (ENABLE_QUICKSTEP_LIVE_TILE.get() && activityControl.isInLiveTileMode()) {

            return createOverviewInputConsumer(event);
@@ -637,6 +652,12 @@ public class TouchInteractionService extends Service implements 
        }

    }



    private boolean isExcludedAssistant(TaskInfo info) {

        return info != null

                && TaskInfoCompat.getActivityType(info) == ACTIVITY_TYPE_ASSISTANT

                && (info.baseIntent.getFlags() & Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0;

    }



    private boolean disableHorizontalSwipe(MotionEvent event) {

        // mExclusionRegion can change on binder thread, use a local instance here.

        Region exclusionRegion = mExclusionRegion;

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

+3 −0
Original line number Diff line number Diff line
@@ -1697,6 +1697,9 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
     * @return How many pixels the running task is offset on the x-axis due to the current scrollX.

     */

    public float getScrollOffset() {

        if (getRunningTaskIndex() == -1) {

            return 0;

        }

        int startScroll = getScrollForPage(getRunningTaskIndex());

        int offsetX = startScroll - getScrollX();

        offsetX *= getScaleX();