Merge changes from topic "am-2cbb68cf-7e12-4b4c-8918-2985468d04c3" into ub-launcher3-master

* changes:
  [automerger] Increase REORDER_TIMEOUT to make it easier for users to create/add to folder. am: 217f0ca2d9
  Increase REORDER_TIMEOUT to make it easier for users to create/add to folder.
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index bd7e6eb..25d9bb6 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -195,7 +195,7 @@
 
     // Variables relating to the creation of user folders by hovering shortcuts over shortcuts
     private static final int FOLDER_CREATION_TIMEOUT = 0;
-    public static final int REORDER_TIMEOUT = 350;
+    public static final int REORDER_TIMEOUT = 650;
     private final Alarm mFolderCreationAlarm = new Alarm();
     private final Alarm mReorderAlarm = new Alarm();
     private PreviewBackground mFolderCreateBg;