diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-07-27 23:08:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-27 23:08:37 +0000 |
| commit | 899c08aee8dba224ac12b5dce27ec1635f4ad07e (patch) | |
| tree | 04eb3aaf904bd4ecbf3dc51b9a21d79da3501945 /src/com/android/launcher3/Workspace.java | |
| parent | 2203caa21641da132211f4e197a192ffa530d402 (diff) | |
| parent | 5e0634fed7039f9cf439c9ed709cbc9ff3eccb0b (diff) | |
| download | android_packages_apps_Trebuchet-899c08aee8dba224ac12b5dce27ec1635f4ad07e.tar.gz android_packages_apps_Trebuchet-899c08aee8dba224ac12b5dce27ec1635f4ad07e.tar.bz2 android_packages_apps_Trebuchet-899c08aee8dba224ac12b5dce27ec1635f4ad07e.zip | |
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.
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 00527018a..a344a7b13 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -286,7 +286,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 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; |