summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-09-09 00:02:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-09 00:02:35 +0000
commiteafe9291c50cdb1568ea7a3bfb1f9e774c30434a (patch)
treee101375cce7f3b245cb4d0eba60572b63a6e0414
parentadd78abb98391ccd74b96e1e4d312e3c89fe0eba (diff)
parent252f0a3321fd9eb86a8ab29addf652bcdc308500 (diff)
downloadandroid_packages_apps_Trebuchet-eafe9291c50cdb1568ea7a3bfb1f9e774c30434a.tar.gz
android_packages_apps_Trebuchet-eafe9291c50cdb1568ea7a3bfb1f9e774c30434a.tar.bz2
android_packages_apps_Trebuchet-eafe9291c50cdb1568ea7a3bfb1f9e774c30434a.zip
Merge "Don't show app info for ITEM_TYPE_SHORTCUT." into ub-launcher3-calgary-polish
-rw-r--r--src/com/android/launcher3/InfoDropTarget.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java
index e136bcd99..398c9d2a2 100644
--- a/src/com/android/launcher3/InfoDropTarget.java
+++ b/src/com/android/launcher3/InfoDropTarget.java
@@ -100,6 +100,7 @@ public class InfoDropTarget extends UninstallDropTarget {
Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) == 1;
return developmentSettingsEnabled
&& (info instanceof AppInfo || info instanceof ShortcutInfo
- || info instanceof PendingAddItemInfo || info instanceof LauncherAppWidgetInfo);
+ || info instanceof PendingAddItemInfo || info instanceof LauncherAppWidgetInfo)
+ && info.itemType != LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
}
}