Commit 21553e28 authored by Anastasia Helfinstein's avatar Anastasia Helfinstein Committed by Commit Bot

[Switch Access] Show keyboard as first action for editable text nodes

Show options for text input before options for scrolling.

AX-Relnotes: n/a.
Bug: None
Change-Id: Ic477d71cd19274da5ccbe71cff68a3b2e5bab4ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2292701
Commit-Queue: Anastasia Helfinstein <anastasi@google.com>
Reviewed-by: default avatarAkihiro Ota <akihiroota@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789129}
parent 0b130923
...@@ -27,19 +27,20 @@ class EditableTextNode extends NodeWrapper { ...@@ -27,19 +27,20 @@ class EditableTextNode extends NodeWrapper {
actions.splice(selectIndex, 1); actions.splice(selectIndex, 1);
} }
actions.push(SwitchAccessMenuAction.KEYBOARD); actions.unshift(
actions.push(SwitchAccessMenuAction.DICTATION); SwitchAccessMenuAction.KEYBOARD, SwitchAccessMenuAction.DICTATION);
if (SwitchAccess.instance.improvedTextInputEnabled()) { if (SwitchAccess.instance.improvedTextInputEnabled()) {
actions.push(SwitchAccessMenuAction.MOVE_CURSOR); actions.push(
actions.push(SwitchAccessMenuAction.JUMP_TO_BEGINNING_OF_TEXT); SwitchAccessMenuAction.MOVE_CURSOR,
actions.push(SwitchAccessMenuAction.JUMP_TO_END_OF_TEXT); SwitchAccessMenuAction.JUMP_TO_BEGINNING_OF_TEXT,
actions.push(SwitchAccessMenuAction.MOVE_BACKWARD_ONE_CHAR_OF_TEXT); SwitchAccessMenuAction.JUMP_TO_END_OF_TEXT,
actions.push(SwitchAccessMenuAction.MOVE_FORWARD_ONE_CHAR_OF_TEXT); SwitchAccessMenuAction.MOVE_BACKWARD_ONE_CHAR_OF_TEXT,
actions.push(SwitchAccessMenuAction.MOVE_BACKWARD_ONE_WORD_OF_TEXT); SwitchAccessMenuAction.MOVE_FORWARD_ONE_CHAR_OF_TEXT,
actions.push(SwitchAccessMenuAction.MOVE_FORWARD_ONE_WORD_OF_TEXT); SwitchAccessMenuAction.MOVE_BACKWARD_ONE_WORD_OF_TEXT,
actions.push(SwitchAccessMenuAction.MOVE_DOWN_ONE_LINE_OF_TEXT); SwitchAccessMenuAction.MOVE_FORWARD_ONE_WORD_OF_TEXT,
actions.push(SwitchAccessMenuAction.MOVE_UP_ONE_LINE_OF_TEXT); SwitchAccessMenuAction.MOVE_DOWN_ONE_LINE_OF_TEXT,
SwitchAccessMenuAction.MOVE_UP_ONE_LINE_OF_TEXT);
actions.push(SwitchAccessMenuAction.START_TEXT_SELECTION); actions.push(SwitchAccessMenuAction.START_TEXT_SELECTION);
if (TextNavigationManager.currentlySelecting()) { if (TextNavigationManager.currentlySelecting()) {
...@@ -47,8 +48,7 @@ class EditableTextNode extends NodeWrapper { ...@@ -47,8 +48,7 @@ class EditableTextNode extends NodeWrapper {
} }
if (TextNavigationManager.selectionExists) { if (TextNavigationManager.selectionExists) {
actions.push(SwitchAccessMenuAction.CUT); actions.push(SwitchAccessMenuAction.CUT, SwitchAccessMenuAction.COPY);
actions.push(SwitchAccessMenuAction.COPY);
} }
if (TextNavigationManager.clipboardHasData) { if (TextNavigationManager.clipboardHasData) {
actions.push(SwitchAccessMenuAction.PASTE); actions.push(SwitchAccessMenuAction.PASTE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment