diff options
| author | Danesh M <daneshm90@gmail.com> | 2014-02-12 18:19:38 -0800 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-02-13 18:21:36 +0000 |
| commit | 5ded925c7f7193c48550632dd1fd048c69daf40d (patch) | |
| tree | c595d9b318b85dd9f924956a13f879fdd4a9fb81 | |
| parent | 77b78aa6659383fc7d7f8f73c340e23b2d48154b (diff) | |
| download | android_packages_apps_Trebuchet-5ded925c7f7193c48550632dd1fd048c69daf40d.tar.gz android_packages_apps_Trebuchet-5ded925c7f7193c48550632dd1fd048c69daf40d.tar.bz2 android_packages_apps_Trebuchet-5ded925c7f7193c48550632dd1fd048c69daf40d.zip | |
Trebuchet : Avoid upgrade paths if ALL_APPS button
Change-Id: I0632760f7c5869940711e711114177cc3e576453
(cherry picked from commit 3fd2e7aa19c7cf1d3e7a6af4168fceefa8c53c17)
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 6 |
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 |