Hide "Shortcut Menu" from a11y actions when shortcut menu is already opened
Bug: 378062790 Change-Id: Iab742e7f24625b1f626c30bbbefdcad68d61904e Test: manual Flag: EXEMPT bugfix
This commit is contained in:
@@ -48,6 +48,8 @@ import com.android.launcher3.model.data.WorkspaceItemFactory;
|
||||
import com.android.launcher3.model.data.WorkspaceItemInfo;
|
||||
import com.android.launcher3.popup.ArrowPopup;
|
||||
import com.android.launcher3.popup.PopupContainerWithArrow;
|
||||
import com.android.launcher3.shortcuts.DeepShortcutTextView;
|
||||
import com.android.launcher3.shortcuts.DeepShortcutView;
|
||||
import com.android.launcher3.touch.ItemLongClickListener;
|
||||
import com.android.launcher3.util.IntArray;
|
||||
import com.android.launcher3.util.IntSet;
|
||||
@@ -104,11 +106,15 @@ public class LauncherAccessibilityDelegate extends BaseAccessibilityDelegate<Lau
|
||||
R.string.action_deep_shortcut, KeyEvent.KEYCODE_S));
|
||||
}
|
||||
|
||||
private static boolean isNotInShortcutMenu(@Nullable View view) {
|
||||
return view == null || !(view.getParent() instanceof DeepShortcutView);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void getSupportedActions(View host, ItemInfo item, List<LauncherAction> out) {
|
||||
// If the request came from keyboard, do not add custom shortcuts as that is already
|
||||
// exposed as a direct shortcut
|
||||
if (ShortcutUtil.supportsShortcuts(item)) {
|
||||
if (isNotInShortcutMenu(host) && ShortcutUtil.supportsShortcuts(item)) {
|
||||
out.add(mActions.get(DEEP_SHORTCUTS));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user