commit 764f67e967544065560f1cfc06f49e0a1ed008a2
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 20 02:43:38 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 20 02:43:38 2020 +0000
tree a094f618ae0822a6636669e10e344fbb3a90890d
parent c475f28b4fb0da06ddba6aa711e1b8655446b2c1
parent 5efa076daea25d32436d987124281c75abbfe9e4

Merge "Re-enable app long-press menu on Go devices" into ub-launcher3-rvc-dev

src/com/android/launcher3/util/ShortcutUtil.java

diff --git a/src/com/android/launcher3/util/ShortcutUtil.java b/src/com/android/launcher3/util/ShortcutUtil.java
index 1ec0690..91cf835 100644
--- a/src/com/android/launcher3/util/ShortcutUtil.java
+++ b/src/com/android/launcher3/util/ShortcutUtil.java
@@ -34,7 +34,7 @@
      * Returns true when we should show depp shortcuts in shortcut menu for the item.
      */
     public static boolean supportsDeepShortcuts(ItemInfo info) {
-        return isActive(info) && isApp(info);
+        return isActive(info) && isApp(info) && !WidgetsModel.GO_DISABLE_WIDGETS;
     }
 
     /**
@@ -64,7 +64,7 @@
     private static boolean isActive(ItemInfo info) {
         boolean isLoading = info instanceof WorkspaceItemInfo
                 && ((WorkspaceItemInfo) info).hasPromiseIconUi();
-        return !isLoading && !info.isDisabled() && !WidgetsModel.GO_DISABLE_WIDGETS;
+        return !isLoading && !info.isDisabled();
     }
 
     private static boolean isApp(ItemInfo info) {