openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
TreeHugger Robot 2020-05-20 02:43:38 +00:00 committed by Android (Google) Code Review
parent c475f28b4f 5efa076dae
commit 764f67e967
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/launcher3/util/ShortcutUtil.java
View File

@ -34,7 +34,7 @@ public class ShortcutUtil {
* 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 @@ public class ShortcutUtil {
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) {