Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f2fec6c authored by Wenyu Zhang's avatar Wenyu Zhang
Browse files

Rename KEY_GESTURE_TYPE_TOGGLE_TALKBACK to *_SCREEN_READER 

TalkBack is the specific name of a 1P app, and not necessarily the
screen reader that every AOSP device will use.

Change-Id: I27d52add451fd24bc606d1c35a68d88d751ad4ab
Bug:b/413279228
Flag: EXEMPT refactor
parent 921f2de4

core/java/android/hardware/input/KeyGestureEvent.java

+4 −4
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public final class KeyGestureEvent { 
    public static final int KEY_GESTURE_TYPE_ACCESSIBILITY_SHORTCUT = 60;

    public static final int KEY_GESTURE_TYPE_CLOSE_ALL_DIALOGS = 61;

    public static final int KEY_GESTURE_TYPE_MOVE_TO_NEXT_DISPLAY = 62;

    public static final int KEY_GESTURE_TYPE_TOGGLE_TALKBACK = 63;

    public static final int KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER = 63;

    public static final int KEY_GESTURE_TYPE_TOGGLE_STICKY_KEYS = 64;

    public static final int KEY_GESTURE_TYPE_TOGGLE_BOUNCE_KEYS = 65;

    public static final int KEY_GESTURE_TYPE_TOGGLE_SLOW_KEYS = 66;
@@ -207,7 +207,7 @@ public final class KeyGestureEvent { 
            KEY_GESTURE_TYPE_ACCESSIBILITY_SHORTCUT,

            KEY_GESTURE_TYPE_CLOSE_ALL_DIALOGS,

            KEY_GESTURE_TYPE_MOVE_TO_NEXT_DISPLAY,

            KEY_GESTURE_TYPE_TOGGLE_TALKBACK,

            KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER,

            KEY_GESTURE_TYPE_TOGGLE_STICKY_KEYS,

            KEY_GESTURE_TYPE_TOGGLE_BOUNCE_KEYS,

            KEY_GESTURE_TYPE_TOGGLE_SLOW_KEYS,
@@ -783,8 +783,8 @@ public final class KeyGestureEvent { 
                return "KEY_GESTURE_TYPE_ACCESSIBILITY_SHORTCUT";

            case KEY_GESTURE_TYPE_CLOSE_ALL_DIALOGS:

                return "KEY_GESTURE_TYPE_CLOSE_ALL_DIALOGS";

            case KEY_GESTURE_TYPE_TOGGLE_TALKBACK:

                return "KEY_GESTURE_TYPE_TOGGLE_TALKBACK";

            case KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER:

                return "KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER";

            case KEY_GESTURE_TYPE_TOGGLE_STICKY_KEYS:

                return "KEY_GESTURE_TYPE_TOGGLE_STICKY_KEYS";

            case KEY_GESTURE_TYPE_TOGGLE_BOUNCE_KEYS:

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/InputGestureMaps.kt

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_MOUSE_KEYS 
import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_NOTIFICATION_PANEL

import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_SLOW_KEYS

import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_STICKY_KEYS

import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_TALKBACK

import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER

import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_VOICE_ACCESS

import com.android.systemui.keyboard.shortcut.shared.model.ShortcutCategoryType.Accessibility

import com.android.systemui.keyboard.shortcut.shared.model.ShortcutCategoryType.AppCategories
@@ -95,7 +95,7 @@ class InputGestureMaps @Inject constructor(private val context: Context) { 
            KEY_GESTURE_TYPE_TOGGLE_STICKY_KEYS to Accessibility,

            KEY_GESTURE_TYPE_TOGGLE_SLOW_KEYS to Accessibility,

            KEY_GESTURE_TYPE_TOGGLE_VOICE_ACCESS to Accessibility,

            KEY_GESTURE_TYPE_TOGGLE_TALKBACK to Accessibility,

            KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER to Accessibility,

            KEY_GESTURE_TYPE_TOGGLE_MAGNIFICATION to Accessibility,

            KEY_GESTURE_TYPE_ACTIVATE_SELECT_TO_SPEAK to Accessibility,

        )
@@ -150,7 +150,7 @@ class InputGestureMaps @Inject constructor(private val context: Context) { 
            KEY_GESTURE_TYPE_TOGGLE_STICKY_KEYS to R.string.shortcutHelper_category_accessibility,

            KEY_GESTURE_TYPE_TOGGLE_SLOW_KEYS to R.string.shortcutHelper_category_accessibility,

            KEY_GESTURE_TYPE_TOGGLE_VOICE_ACCESS to R.string.shortcutHelper_category_accessibility,

            KEY_GESTURE_TYPE_TOGGLE_TALKBACK to R.string.shortcutHelper_category_accessibility,

            KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER to R.string.shortcutHelper_category_accessibility,

            KEY_GESTURE_TYPE_TOGGLE_MAGNIFICATION to R.string.shortcutHelper_category_accessibility,

            KEY_GESTURE_TYPE_ACTIVATE_SELECT_TO_SPEAK to

                R.string.shortcutHelper_category_accessibility,
@@ -202,7 +202,7 @@ class InputGestureMaps @Inject constructor(private val context: Context) { 
            KEY_GESTURE_TYPE_TOGGLE_SLOW_KEYS to R.string.group_accessibility_toggle_slow_keys,

            KEY_GESTURE_TYPE_TOGGLE_VOICE_ACCESS to

                R.string.group_accessibility_toggle_voice_access,

            KEY_GESTURE_TYPE_TOGGLE_TALKBACK to R.string.group_accessibility_toggle_talkback,

            KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER to R.string.group_accessibility_toggle_talkback,

            KEY_GESTURE_TYPE_TOGGLE_MAGNIFICATION to

                R.string.group_accessibility_toggle_magnification,

            KEY_GESTURE_TYPE_ACTIVATE_SELECT_TO_SPEAK to

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        if (enableTalkbackAndMagnifierKeyGestures()) {

            supportedGestures.add(KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_MAGNIFICATION);

            supportedGestures.add(KeyGestureEvent.KEY_GESTURE_TYPE_ACTIVATE_SELECT_TO_SPEAK);

            supportedGestures.add(KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_TALKBACK);

            supportedGestures.add(KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER);

        }

        if (enableVoiceAccessKeyGestures()) {

            supportedGestures.add(KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_VOICE_ACCESS);
@@ -719,7 +719,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                    R.string.config_defaultSelectToSpeakService);

            case KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_VOICE_ACCESS -> mContext.getString(

                    R.string.config_defaultVoiceAccessService);

            case KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_TALKBACK -> mContext.getString(

            case KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER -> mContext.getString(

                    R.string.config_defaultAccessibilityService);

            default -> "";

        };
@@ -742,7 +742,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                break;

            case KeyGestureEvent.KEY_GESTURE_TYPE_ACTIVATE_SELECT_TO_SPEAK:

            case KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_VOICE_ACCESS:

            case KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_TALKBACK:

            case KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER:

                targetName = getTargetNameFromKeyGestureType(gestureType);

                if (targetName.isEmpty()) {

                    return;

services/core/java/com/android/server/input/InputGestureManager.java

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ final class InputGestureManager { 
        if (enableTalkbackAndMagnifierKeyGestures()) {

            systemShortcuts.add(createKeyGesture(KeyEvent.KEYCODE_T,

                    KeyEvent.META_META_ON | KeyEvent.META_ALT_ON,

                    KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_TALKBACK));

                    KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER));

            systemShortcuts.add(createKeyGesture(KeyEvent.KEYCODE_M,

                    KeyEvent.META_META_ON | KeyEvent.META_ALT_ON,

                    KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_MAGNIFICATION));

services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -2293,7 +2293,7 @@ public class AccessibilityManagerServiceTest { 
                mA11yms.getCurrentUserIdLocked())).isEmpty();



        mA11yms.handleKeyGestureEvent(new KeyGestureEvent.Builder().setKeyGestureType(

                KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_TALKBACK).setAction(

                KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER).setAction(

                KeyGestureEvent.ACTION_GESTURE_COMPLETE).build());



        assertThat(ShortcutUtils.getShortcutTargetsFromSettings(mTestableContext, KEY_GESTURE,