diff options
author | Michael Jurka <mikejurka@google.com> | 2010-09-17 15:00:07 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2010-09-24 15:28:20 -0700 |
commit | 0280c3be4d9f8fc6fdf015b7ecd276eb26f76f2d (patch) | |
tree | ffebcc83e7c161dac612463d15882f9b83e6f591 /src/com/android/launcher2/FolderIcon.java | |
parent | 513b8c94fb1dc3af246fcc8a7f8c0dd593d86cbd (diff) | |
download | android_packages_apps_Trebuchet-0280c3be4d9f8fc6fdf015b7ecd276eb26f76f2d.tar.gz android_packages_apps_Trebuchet-0280c3be4d9f8fc6fdf015b7ecd276eb26f76f2d.tar.bz2 android_packages_apps_Trebuchet-0280c3be4d9f8fc6fdf015b7ecd276eb26f76f2d.zip |
Adding support for drag and drop of folders and shortcuts.
also:
- Long press on empty space on workspace now brings up customization tray
- Fixed: while dragging, items appeared to be dropping on folders two cells to the right
- Fixed: Disabling drops on folders when the workspace is shrunken
- Fixed: account for scaling of dragged items when checking if they overlap
with shrunken workspace screens
- Making folder icons dimmable to match shortcuts and widgets
- When deciding with shrunken workspace screen we're dragging to, we now use the closest screen rather than the one that has been overlapped the most
- Refactored drag/add mechanism, removing array of occupied cells from CellInfo
- Removed dead code/variables
Diffstat (limited to 'src/com/android/launcher2/FolderIcon.java')
-rw-r--r-- | src/com/android/launcher2/FolderIcon.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java index e2cef0e69..e692d2058 100644 --- a/src/com/android/launcher2/FolderIcon.java +++ b/src/com/android/launcher2/FolderIcon.java @@ -29,7 +29,7 @@ import com.android.launcher.R; /** * An icon that can appear on in the workspace representing an {@link UserFolder}. */ -public class FolderIcon extends BubbleTextView implements DropTarget { +public class FolderIcon extends DimmableBubbleTextView implements DropTarget { private UserFolderInfo mInfo; private Launcher mLauncher; private Drawable mCloseIcon; @@ -43,6 +43,10 @@ public class FolderIcon extends BubbleTextView implements DropTarget { super(context); } + public boolean isDropEnabled() { + return !((Workspace)getParent().getParent()).isSmall(); + } + static FolderIcon fromXml(int resId, Launcher launcher, ViewGroup group, UserFolderInfo folderInfo) { |