diff options
author | Winson Chung <winsonc@google.com> | 2015-03-11 01:31:30 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-11 01:31:30 +0000 |
commit | fc52a8fb0312393e0a729764fbe57c43839e4c0f (patch) | |
tree | 3c29e0bbe7274ed138f53ee044453cf69af7e96e /src/com/android/launcher3/Folder.java | |
parent | d0dfc83e347211771a8cd011680e6ea23660a08f (diff) | |
parent | b745afbdd75157c73d581b345118cdaff99e912d (diff) | |
download | android_packages_apps_Trebuchet-fc52a8fb0312393e0a729764fbe57c43839e4c0f.tar.gz android_packages_apps_Trebuchet-fc52a8fb0312393e0a729764fbe57c43839e4c0f.tar.bz2 android_packages_apps_Trebuchet-fc52a8fb0312393e0a729764fbe57c43839e4c0f.zip |
Merge "Initial changes to break out AllApps into its own view." into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r-- | src/com/android/launcher3/Folder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 87ef0bcb4..bef1f0da4 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -24,6 +24,7 @@ import android.animation.PropertyValuesHolder; import android.annotation.TargetApi; import android.content.Context; import android.content.res.Resources; +import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; import android.os.Build; @@ -47,7 +48,6 @@ import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.LinearLayout; import android.widget.TextView; - import com.android.launcher3.FolderInfo.FolderListener; import com.android.launcher3.Workspace.ItemOperator; @@ -220,7 +220,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList return false; } - mLauncher.getWorkspace().beginDragShared(v, this); + mLauncher.getWorkspace().beginDragShared(v, new Point(), this, false); mCurrentDragInfo = item; mEmptyCellRank = item.rank; |