Removing "accessibility drag" action for shortcuts in menu

It's not supported there and causes Launcher to crash

Bug: 116023881
Test: Manual
Change-Id: Ib8a99ffeed41c3c3b70dec6bab7c5330a0412c66
This commit is contained in:
vadimt
2019-02-07 19:44:08 -08:00
parent 8fa51172f6
commit 5bc87ec9ae
@@ -127,9 +127,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
}
// Do not add move actions for keyboard request as this uses virtual nodes.
if (!fromKeyboard && ((item instanceof ShortcutInfo)
|| (item instanceof LauncherAppWidgetInfo)
|| (item instanceof FolderInfo))) {
if (!fromKeyboard && itemSupportsAccessibleDrag(item)) {
info.addAction(mActions.get(MOVE));
if (item.container >= 0) {
@@ -146,6 +144,15 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
}
}
private boolean itemSupportsAccessibleDrag(ItemInfo item) {
if (item instanceof ShortcutInfo) {
// Support the action unless the item is in a context menu.
return item.screenId >= 0;
}
return (item instanceof LauncherAppWidgetInfo)
|| (item instanceof FolderInfo);
}
@Override
public boolean performAccessibilityAction(View host, int action, Bundle args) {
if ((host.getTag() instanceof ItemInfo)