diff options
author | Adam Cohen <adamcohen@google.com> | 2011-05-05 10:44:55 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-05 10:44:55 -0700 |
commit | be4ffee486f3bda372d082a352cc06f6b2176505 (patch) | |
tree | 7ded99ad27be5e9434cff65ee9be4c05682a93b7 /src | |
parent | 11d4cef1a8fceca4e98f1720f05986fc38e9cecf (diff) | |
parent | 0c872ba544ecfd9b106bb66137da8680927590de (diff) | |
download | android_packages_apps_Trebuchet-be4ffee486f3bda372d082a352cc06f6b2176505.tar.gz android_packages_apps_Trebuchet-be4ffee486f3bda372d082a352cc06f6b2176505.tar.bz2 android_packages_apps_Trebuchet-be4ffee486f3bda372d082a352cc06f6b2176505.zip |
Merge "Fixing small folder bugs"
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/Folder.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index 5a4358d2f..3a8a68d56 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -29,6 +29,7 @@ import android.content.Context; import android.graphics.Rect; import android.util.AttributeSet; import android.view.LayoutInflater; +import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; import android.widget.AdapterView; @@ -40,6 +41,7 @@ import android.widget.AdapterView.OnItemLongClickListener; import com.android.launcher.R; import com.android.launcher2.FolderInfo.FolderListener; +import com.android.launcher2.Workspace.ShrinkState; /** * Represents a set of icons chosen by the user or generated by the system. @@ -144,6 +146,14 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL return true; } + /** + * We need to handle touch events to prevent them from falling through to the workspace below. + */ + @Override + public boolean onTouchEvent(MotionEvent ev) { + return true; + } + public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) { if (!view.isInTouchMode()) { return false; @@ -353,7 +363,6 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL } findAndSetEmptyCells(item); mInfo.add(item); - createAndAddShortcut(item); LauncherModel.addOrMoveItemInDatabase(mLauncher, item, mInfo.id, 0, item.cellX, item.cellY); } |