summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2014-02-12 18:19:38 -0800
committerDanesh M <daneshm90@gmail.com>2014-02-13 02:53:27 +0000
commit3fd2e7aa19c7cf1d3e7a6af4168fceefa8c53c17 (patch)
tree52d91d57a11c4c4272a00fe8d76afb7827a7a5bc /src/com/android/launcher3
parent837b7b9f9212d870b3a391b2118dae514bf7da6b (diff)
downloadandroid_packages_apps_Trebuchet-3fd2e7aa19c7cf1d3e7a6af4168fceefa8c53c17.tar.gz
android_packages_apps_Trebuchet-3fd2e7aa19c7cf1d3e7a6af4168fceefa8c53c17.tar.bz2
android_packages_apps_Trebuchet-3fd2e7aa19c7cf1d3e7a6af4168fceefa8c53c17.zip
Trebuchet : Avoid upgrade paths if ALL_APPS button
Change-Id: I0632760f7c5869940711e711114177cc3e576453
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r--src/com/android/launcher3/LauncherModel.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index c6ef2b7bf..d79e6279b 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2825,7 +2825,8 @@ public class LauncherModel extends BroadcastReceiver {
ItemInfoFilter f) {
HashSet<ItemInfo> filtered = new HashSet<ItemInfo>();
for (ItemInfo i : infos) {
- if (i instanceof ShortcutInfo) {
+ if (i instanceof ShortcutInfo &&
+ (i.itemType != LauncherSettings.Favorites.ITEM_TYPE_ALLAPPS)) {
ShortcutInfo info = (ShortcutInfo) i;
ComponentName cn = info.intent.getComponent();
if (cn != null && f.filterItem(null, info, cn)) {
@@ -2871,7 +2872,8 @@ public class LauncherModel extends BroadcastReceiver {
}
public static boolean isShortcutInfoUpdateable(ItemInfo i) {
- if (i instanceof ShortcutInfo) {
+ if (i instanceof ShortcutInfo &&
+ i.itemType != LauncherSettings.Favorites.ITEM_TYPE_ALLAPPS) {
ShortcutInfo info = (ShortcutInfo) i;
// We need to check for ACTION_MAIN otherwise getComponent() might
// return null for some shortcuts (for instance, for shortcuts to