diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-07-28 19:23:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-28 19:23:29 +0000 |
commit | 55f5bd730cace56d224de33461f575f41bdd480f (patch) | |
tree | f7a8da0070df451118f42917626ecd8da2f4bd74 /src/com/android/launcher3/LauncherModel.java | |
parent | e34dd33156ec0e6651dda3aa73fe4e6a1df9d5ae (diff) | |
parent | 70a7c9b70003ae87e2b2968bc6ceded0fe0f0e8b (diff) | |
download | android_packages_apps_Trebuchet-55f5bd730cace56d224de33461f575f41bdd480f.tar.gz android_packages_apps_Trebuchet-55f5bd730cace56d224de33461f575f41bdd480f.tar.bz2 android_packages_apps_Trebuchet-55f5bd730cace56d224de33461f575f41bdd480f.zip |
Merge "Showing the shortcuts in the disabled state and removing ti from the menu when its disabled" into ub-launcher3-calgary
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 61dda1c52..b42f80c0f 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -2842,9 +2842,11 @@ public class LauncherModel extends BroadcastReceiver // Now add the new shortcuts to the map. for (ShortcutInfoCompat shortcut : shortcuts) { - ComponentKey targetComponent - = new ComponentKey(shortcut.getActivity(), shortcut.getUserHandle()); - mBgDeepShortcutMap.addToList(targetComponent, shortcut.getId()); + if (shortcut.isEnabled()) { + ComponentKey targetComponent + = new ComponentKey(shortcut.getActivity(), shortcut.getUserHandle()); + mBgDeepShortcutMap.addToList(targetComponent, shortcut.getId()); + } } } |