commit eeebf0111b25da15ffce4f316612b4a1b53663e1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Dec 16 09:36:34 2024 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 16 09:36:34 2024 -0800
tree 9047d74df90ec389903b3b773a321365e7772406
parent c812907eb8b03759567aac7d550df1c3bcaae023
parent 0f4e5e974d490fb812cf7fcc567c34394899d747

Merge "Don't allow drag n drops to auto-switch pages during accessibility item moves." into main

src/com/android/launcher3/dragndrop/SpringLoadedDragController.kt

diff --git a/src/com/android/launcher3/dragndrop/SpringLoadedDragController.kt b/src/com/android/launcher3/dragndrop/SpringLoadedDragController.kt
index 2aeab9d..4cbe7bb 100644
--- a/src/com/android/launcher3/dragndrop/SpringLoadedDragController.kt
+++ b/src/com/android/launcher3/dragndrop/SpringLoadedDragController.kt
@@ -47,7 +47,11 @@
     override fun onAlarm(alarm: Alarm) {
         if (screen != null) {
             // Snap to the screen that we are hovering over now
-            with(launcher.workspace) { if (!isVisible(screen)) snapToPage(indexOfChild(screen)) }
+            with(launcher.workspace) {
+                if (!isVisible(screen) && launcher.dragController.mDistanceSinceScroll != 0) {
+                    snapToPage(indexOfChild(screen))
+                }
+            }
         } else {
             launcher.dragController.cancelDrag()
         }