summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNebojsa Cvetkovic <nebkat@gmail.com>2014-01-04 15:54:03 +0000
committerDanesh M <daneshm90@gmail.com>2014-01-24 16:25:19 -0800
commitcd7dd3299ed70b82aad991063769eb6f3d33ce42 (patch)
tree1d04f2172a6ed730881bcfe7c2448617b9553bea /src
parent9f0e132f8f21c7de6df3f1e8f1500f594557bd9c (diff)
downloadandroid_packages_apps_Trebuchet-cd7dd3299ed70b82aad991063769eb6f3d33ce42.tar.gz
android_packages_apps_Trebuchet-cd7dd3299ed70b82aad991063769eb6f3d33ce42.tar.bz2
android_packages_apps_Trebuchet-cd7dd3299ed70b82aad991063769eb6f3d33ce42.zip
Workspace: Don't allow folder creation on AllApps icon
Change-Id: I5438ac81450450ba03c0f0cc6a33bd69dcbd0515
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Workspace.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 84a5996df..f2a06e86c 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2654,7 +2654,9 @@ public class Workspace extends SmoothPagedView
return false;
}
- boolean aboveShortcut = (dropOverView.getTag() instanceof ShortcutInfo);
+ ItemInfo dropOverViewInfo = (ItemInfo) dropOverView.getTag();
+ boolean aboveShortcut = (dropOverViewInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION ||
+ dropOverViewInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT);
boolean willBecomeShortcut =
(info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION ||
info.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT);