commit 899c08aee8dba224ac12b5dce27ec1635f4ad07e
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 27 23:08:37 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 27 23:08:37 2018 +0000
tree 04eb3aaf904bd4ecbf3dc51b9a21d79da3501945
parent 2203caa21641da132211f4e197a192ffa530d402
parent 5e0634fed7039f9cf439c9ed709cbc9ff3eccb0b

Merge changes from topic "am-402aa8b3-7a45-468a-931d-83007cd71180" into ub-launcher3-master

* changes:
  [automerger] Increase max distance for folder creation for tablets. am: 5aab8703ee
  Increase max distance for folder creation for tablets.

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 0052701..a344a7b 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -286,7 +286,9 @@
         mInsets.set(insets);
 
         DeviceProfile grid = mLauncher.getDeviceProfile();
-        mMaxDistanceForFolderCreation = (0.55f * grid.iconSizePx);
+        mMaxDistanceForFolderCreation = grid.isTablet
+                ? 0.75f * grid.iconSizePx
+                : 0.55f * grid.iconSizePx;
         mWorkspaceFadeInAdjacentScreens = grid.shouldFadeAdjacentWorkspaceScreens();
 
         Rect padding = grid.workspacePadding;