summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/InfoDropTarget.java
diff options
context:
space:
mode:
authorNebojsa Cvetkovic <nebkat@gmail.com>2014-01-01 16:22:41 +0000
committerDanesh M <daneshm90@gmail.com>2014-01-24 16:25:19 -0800
commit9f0e132f8f21c7de6df3f1e8f1500f594557bd9c (patch)
tree8ef1e2053ada059ad74ec32905e980da5a5b9c7c /src/com/android/launcher3/InfoDropTarget.java
parent9bbb6cf6d78824d4c68382f33b654c43f4aaa109 (diff)
downloadandroid_packages_apps_Trebuchet-9f0e132f8f21c7de6df3f1e8f1500f594557bd9c.tar.gz
android_packages_apps_Trebuchet-9f0e132f8f21c7de6df3f1e8f1500f594557bd9c.tar.bz2
android_packages_apps_Trebuchet-9f0e132f8f21c7de6df3f1e8f1500f594557bd9c.zip
Hotseat: Movable AllApps button
Change-Id: I4273c460392c8329368a23ef6f0d9698f52adfea
Diffstat (limited to 'src/com/android/launcher3/InfoDropTarget.java')
-rw-r--r--src/com/android/launcher3/InfoDropTarget.java17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java
index d27ddd958..73cda08a9 100644
--- a/src/com/android/launcher3/InfoDropTarget.java
+++ b/src/com/android/launcher3/InfoDropTarget.java
@@ -63,12 +63,17 @@ public class InfoDropTarget extends ButtonDropTarget {
}
private ComponentName dragItemComponentName(Object dragInfo) {
- if (dragInfo instanceof AppInfo) {
- return ((AppInfo) dragInfo).componentName;
- } else if (dragInfo instanceof ShortcutInfo) {
- return ((ShortcutInfo) dragInfo).intent.getComponent();
- } else if (dragInfo instanceof PendingAddItemInfo) {
- return ((PendingAddItemInfo) dragInfo).componentName;
+ if (dragInfo instanceof ItemInfo) {
+ if (((ItemInfo) dragInfo).itemType == LauncherSettings.Favorites.ITEM_TYPE_ALLAPPS) {
+ return null;
+ }
+ if (dragInfo instanceof AppInfo) {
+ return ((AppInfo) dragInfo).componentName;
+ } else if (dragInfo instanceof ShortcutInfo) {
+ return ((ShortcutInfo) dragInfo).intent.getComponent();
+ } else if (dragInfo instanceof PendingAddItemInfo) {
+ return ((PendingAddItemInfo) dragInfo).componentName;
+ }
}
return null;
}