Disable flingToDelete for dragging view.

PureAway · Mar 29, 2018 · 703635a · 703635a
1 parent 2488d16
commit 703635a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
@@ -3740,6 +3740,7 @@ public void run() {
                     Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, mDelayedResizeRunnable);
             mDelayedResizeRunnable = null;
         }
+
     }
 
     /**
@@ -3798,7 +3799,7 @@ public float getIntrinsicIconScaleFactor() {
 
     @Override
     public boolean supportsFlingToDelete() {
-        return true;
+        return false;
     }
 
     @Override

diff --git a/tests/src/com/android/launcher3/util/GridOccupancyTest.java b/tests/src/com/android/launcher3/util/GridOccupancyTest.java
@@ -2,6 +2,8 @@
 
 import android.test.suitebuilder.annotation.SmallTest;
 
+import com.android.launcher3.LauncherSettings;
+
 import junit.framework.TestCase;
 
 /**
@@ -19,15 +21,15 @@ public void testFindVacantCell() {
                 );
 
         int[] vacant = new int[2];
-        assertTrue(grid.findVacantCell(vacant, 2, 2));
+        assertTrue(grid.findVacantCell(vacant, 2, 2, LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT));
         assertEquals(vacant[0], 0);
         assertEquals(vacant[1], 1);
 
-        assertTrue(grid.findVacantCell(vacant, 3, 2));
+        assertTrue(grid.findVacantCell(vacant, 3, 2, LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT));
         assertEquals(vacant[0], 2);
         assertEquals(vacant[1], 2);
 
-        assertFalse(grid.findVacantCell(vacant, 3, 3));
+        assertFalse(grid.findVacantCell(vacant, 3, 3, LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT));
     }
 
     public void testIsRegionVacant() {