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

Commit 85ab1e7e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reset touch state when removing all tasks in RecentsView.applyLoadPlan"... 

Merge "Reset touch state when removing all tasks in RecentsView.applyLoadPlan" into tm-dev am: 37fa1392

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17586926



Change-Id: I64373746a4120214b90b151434b018ddf78200c0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 103c5261 37fa1392

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

+3 −0
Original line number Diff line number Diff line
@@ -1396,6 +1396,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        if (taskGroups == null || taskGroups.isEmpty()) {

            removeTasksViewsAndClearAllButton();

            onTaskStackUpdated();

            // With all tasks removed, touch handling in PagedView is disabled and we need to reset

            // touch state or otherwise values will be obsolete.

            resetTouchState();

            return;

        }

src/com/android/launcher3/PagedView.java

+1 −1
Original line number Diff line number Diff line
@@ -1440,7 +1440,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
        return Math.abs(velocity) > threshold;

    }



    private void resetTouchState() {

    protected void resetTouchState() {

        releaseVelocityTracker();

        mIsBeingDragged = false;

        mActivePointerId = INVALID_POINTER;