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

Commit f95a8459 authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-merger
Browse files

Merge "Using a separate InputConsumer when Launcher is resumed but not... 

Merge "Using a separate InputConsumer when Launcher is resumed but not focused" into ub-launcher3-qt-dev
am: 7183795f

Change-Id: Idafa9bc76dc8d22b3f69388824859d86e0737a81
parents d5270da8 7183795f

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java

+0 −3
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@ public class NavBarToHomeTouchController implements TouchController, SwipeDetect 
        if (mStartState == OVERVIEW || mStartState == ALL_APPS) {

            return true;

        }

        if (!mLauncher.hasWindowFocus()) {

            return true;

        }

        if (AbstractFloatingView.getTopOpenView(mLauncher) != null) {

            return true;

        }

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

+31 −9
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import android.view.WindowManager; 


import androidx.annotation.BinderThread;



import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.MainThreadExecutor;

import com.android.launcher3.R;

import com.android.launcher3.ResourceUtils;
@@ -79,6 +80,7 @@ import com.android.quickstep.inputconsumers.DeviceLockedInputConsumer; 
import com.android.quickstep.inputconsumers.InputConsumer;

import com.android.quickstep.inputconsumers.OtherActivityInputConsumer;

import com.android.quickstep.inputconsumers.OverviewInputConsumer;

import com.android.quickstep.inputconsumers.OverviewWithoutFocusInputConsumer;

import com.android.quickstep.inputconsumers.ScreenPinnedInputConsumer;

import com.android.systemui.shared.recents.IOverviewProxy;

import com.android.systemui.shared.recents.ISystemUiProxy;
@@ -566,10 +568,9 @@ public class TouchInteractionService extends Service implements 
            info.id = mSwipeSharedState.nextRunningTaskId;

            return createOtherActivityInputConsumer(event, info);

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

            return OverviewInputConsumer.newInstance(activityControl, mInputMonitorCompat, false);

        } else if (ENABLE_QUICKSTEP_LIVE_TILE.get() &&

                activityControl.isInLiveTileMode()) {

            return OverviewInputConsumer.newInstance(activityControl, mInputMonitorCompat, false);

            return createOverviewInputConsumer(event);

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

            return createOverviewInputConsumer(event);

        } else if (mGestureBlockingActivity != null && runningTaskInfo != null

                && mGestureBlockingActivity.equals(runningTaskInfo.topActivity)) {

            return InputConsumer.NO_OP;
@@ -578,20 +579,24 @@ public class TouchInteractionService extends Service implements 
        }

    }



    private boolean disableHorizontalSwipe(MotionEvent event) {

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

        Region exclusionRegion = mExclusionRegion;

        return mMode == Mode.NO_BUTTON && exclusionRegion != null

                && exclusionRegion.contains((int) event.getX(), (int) event.getY());

    }



    private OtherActivityInputConsumer createOtherActivityInputConsumer(MotionEvent event,

            RunningTaskInfo runningTaskInfo) {

        final ActivityControlHelper activityControl =

                mOverviewComponentObserver.getActivityControlHelper();

        boolean shouldDefer = activityControl.deferStartingActivity(mActiveNavBarRegion, event);



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

        Region exclusionRegion = mExclusionRegion;

        boolean disableHorizontalSwipe = mMode == Mode.NO_BUTTON && exclusionRegion != null

                && exclusionRegion.contains((int) event.getX(), (int) event.getY());

        return new OtherActivityInputConsumer(this, runningTaskInfo, mRecentsModel,

                mOverviewComponentObserver.getOverviewIntent(), activityControl,

                shouldDefer, mOverviewCallbacks, mInputConsumer, this::onConsumerInactive,

                mSwipeSharedState, mInputMonitorCompat, mSwipeTouchRegion, disableHorizontalSwipe);

                mSwipeSharedState, mInputMonitorCompat, mSwipeTouchRegion,

                disableHorizontalSwipe(event));

    }



    private InputConsumer createDeviceLockedInputConsumer(RunningTaskInfo taskInfo) {
@@ -603,6 +608,23 @@ public class TouchInteractionService extends Service implements 
        }

    }



    public InputConsumer createOverviewInputConsumer(MotionEvent event) {

        final ActivityControlHelper activityControl =

                mOverviewComponentObserver.getActivityControlHelper();

        BaseDraggingActivity activity = activityControl.getCreatedActivity();

        if (activity == null) {

            return InputConsumer.NO_OP;

        }



        if (activity.getRootView().hasWindowFocus()) {

            return new OverviewInputConsumer(activity, mInputMonitorCompat,

                    false /* startingInActivityBounds */);

        } else {

            return new OverviewWithoutFocusInputConsumer(this, mInputMonitorCompat,

                    disableHorizontalSwipe(event));

        }

    }



    /**

     * To be called by the consumer when it's no longer active.

     */

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

+3 −1
Original line number Diff line number Diff line
@@ -858,7 +858,9 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
            setTargetAlphaProvider(WindowTransformSwipeHandler::getHiddenTargetAlpha);

        }



        return OverviewInputConsumer.newInstance(mActivityControlHelper, null, true);

        BaseDraggingActivity activity = mActivityControlHelper.getCreatedActivity();

        return activity == null

                ? InputConsumer.NO_OP : new OverviewInputConsumer(activity, null, true);

    }



    private void endRunningWindowAnim() {

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/InputConsumer.java

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ public interface InputConsumer { 
    int TYPE_DEVICE_LOCKED = 1 << 4;

    int TYPE_ACCESSIBILITY = 1 << 5;

    int TYPE_SCREEN_PINNED = 1 << 6;

    int TYPE_OVERVIEW_WITHOUT_FOCUS = 1 << 7;



    InputConsumer NO_OP = () -> TYPE_NO_OP;
@@ -78,6 +79,8 @@ public interface InputConsumer { 
                return "ACCESSIBILITY";

            case TYPE_SCREEN_PINNED:

                return "SCREEN_PINNED";

            case TYPE_OVERVIEW_WITHOUT_FOCUS:

                return "TYPE_OVERVIEW_WITHOUT_FOCUS";

            default:

                return "NO_OP";

        }

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java

+8 −20
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import static com.android.launcher3.uioverrides.RecentsUiFactory.ROTATION_LANDSC 
import static com.android.launcher3.uioverrides.RecentsUiFactory.ROTATION_SEASCAPE;

import static com.android.launcher3.util.RaceConditionTracker.ENTER;

import static com.android.launcher3.util.RaceConditionTracker.EXIT;

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;

import static com.android.quickstep.TouchInteractionService.TOUCH_INTERACTION_LOG;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
@@ -43,10 +42,8 @@ import android.os.Build; 
import android.os.Handler;

import android.os.Looper;

import android.view.MotionEvent;

import android.view.Surface;

import android.view.VelocityTracker;

import android.view.ViewConfiguration;

import android.view.WindowManager;



import androidx.annotation.UiThread;
@@ -65,6 +62,7 @@ import com.android.quickstep.WindowTransformSwipeHandler; 
import com.android.quickstep.WindowTransformSwipeHandler.GestureEndTarget;

import com.android.quickstep.util.CachedEventDispatcher;

import com.android.quickstep.util.MotionPauseDetector;

import com.android.quickstep.util.NavBarPosition;

import com.android.quickstep.util.RecentsAnimationListenerSet;

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

import com.android.systemui.shared.system.BackgroundExecutor;
@@ -95,7 +93,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC 
    private final SysUINavigationMode.Mode mMode;

    private final RectF mSwipeTouchRegion;



    private final int mDisplayRotation;

    private final NavBarPosition mNavBarPosition;



    private final Consumer<OtherActivityInputConsumer> mOnCompleteCallback;

    private final MotionPauseDetector mMotionPauseDetector;
@@ -157,7 +155,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC 
        mInputConsumer = inputConsumer;

        mSwipeSharedState = swipeSharedState;



        mDisplayRotation = getSystemService(WindowManager.class).getDefaultDisplay().getRotation();

        mNavBarPosition = new NavBarPosition(base);

        mDragSlop = QuickStepContract.getQuickStepDragSlopPx();

        float slop = QuickStepContract.getQuickStepTouchSlopPx();

        mSquaredTouchSlop = slop * slop;
@@ -188,9 +186,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC 
        if (mPassedDragSlop && mInteractionHandler != null

                && !mRecentsViewDispatcher.hasConsumer()) {

            mRecentsViewDispatcher.setConsumer(mInteractionHandler.getRecentsViewDispatcher(

                    isNavBarOnLeft()

                            ? ROTATION_SEASCAPE

                            : (isNavBarOnRight() ? ROTATION_LANDSCAPE : RotationMode.NORMAL)));

                    mNavBarPosition.getRotationMode()));

        }

        int edgeFlags = ev.getEdgeFlags();

        ev.setEdgeFlags(edgeFlags | EDGE_NAV_BAR);
@@ -329,14 +325,6 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC 
        mInteractionHandler.onGestureStarted();

    }



    private boolean isNavBarOnRight() {

        return mMode != NO_BUTTON && mDisplayRotation == Surface.ROTATION_90;

    }



    private boolean isNavBarOnLeft() {

        return mMode != NO_BUTTON && mDisplayRotation == Surface.ROTATION_270;

    }



    private void startTouchTrackingForWindowAnimation(long touchTimeMs) {

        TOUCH_INTERACTION_LOG.addLog("startRecentsAnimation");
@@ -382,8 +370,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC 
                        ViewConfiguration.get(this).getScaledMaximumFlingVelocity());

                float velocityX = mVelocityTracker.getXVelocity(mActivePointerId);

                float velocityY = mVelocityTracker.getYVelocity(mActivePointerId);

                float velocity = isNavBarOnRight() ? velocityX

                        : isNavBarOnLeft() ? -velocityX

                float velocity = mNavBarPosition.isRightEdge() ? velocityX

                        : mNavBarPosition.isLeftEdge() ? -velocityX

                                : velocityY;



                mInteractionHandler.updateDisplacement(getDisplacement(ev) - mStartDisplacement);
@@ -444,9 +432,9 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC 
    }



    private float getDisplacement(MotionEvent ev) {

        if (isNavBarOnRight()) {

        if (mNavBarPosition.isRightEdge()) {

            return ev.getX() - mDownPos.x;

        } else if (isNavBarOnLeft()) {

        } else if (mNavBarPosition.isLeftEdge()) {

            return mDownPos.x - ev.getX();

        } else {

            return ev.getY() - mDownPos.y;