From 26850a2f3f5b70b2ef375096f42b5d13322815c8 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 5 Feb 2019 14:56:33 -0800
Subject: [PATCH] Removing "remove" accessibility action for deep shortcuts in
 menu

Bug: 116023881
Test: Manual
Change-Id: Ia9c25e2e1b4cbca9d2c87a17464c175733955ccf
---
 src/com/android/launcher3/DeleteDropTarget.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index d60dc87e4a..70c8aaa4b0 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher3;
 
+import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
+
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -62,8 +64,12 @@ public class DeleteDropTarget extends ButtonDropTarget {
      */
     @Override
     public boolean supportsAccessibilityDrop(ItemInfo info, View view) {
-        return (info instanceof ShortcutInfo)
-                || (info instanceof LauncherAppWidgetInfo)
+        if (info instanceof ShortcutInfo) {
+            // Support the action unless the item is in a context menu.
+            return info.screenId >= 0;
+        }
+
+        return (info instanceof LauncherAppWidgetInfo)
                 || (info instanceof FolderInfo);
     }