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

Commit 7283ec5c authored by Daniel Norman's avatar Daniel Norman Committed by Automerger Merge Worker
Browse files

Merge "Add menu and media play/pause global actions [1/2]" into main am: cf7ffed6 am: bf50d5c1

parents a96c939d bf50d5c1
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -3453,6 +3453,8 @@ package android.accessibilityservice {
    field public static final int GLOBAL_ACTION_HOME = 2; // 0x2
    field public static final int GLOBAL_ACTION_KEYCODE_HEADSETHOOK = 10; // 0xa
    field public static final int GLOBAL_ACTION_LOCK_SCREEN = 8; // 0x8
    field @FlaggedApi("android.view.accessibility.global_action_media_play_pause") public static final int GLOBAL_ACTION_MEDIA_PLAY_PAUSE = 22; // 0x16
    field @FlaggedApi("android.view.accessibility.global_action_menu") public static final int GLOBAL_ACTION_MENU = 21; // 0x15
    field public static final int GLOBAL_ACTION_NOTIFICATIONS = 4; // 0x4
    field public static final int GLOBAL_ACTION_POWER_DIALOG = 6; // 0x6
    field public static final int GLOBAL_ACTION_QUICK_SETTINGS = 5; // 0x5
+13 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import android.view.accessibility.AccessibilityInteractionClient;
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
import android.view.accessibility.AccessibilityWindowInfo;
import android.view.accessibility.Flags;
import android.view.inputmethod.EditorInfo;

import com.android.internal.annotations.VisibleForTesting;
@@ -625,6 +626,18 @@ public abstract class AccessibilityService extends Service {
     */
    public static final int GLOBAL_ACTION_DPAD_CENTER = 20;

    /**
     * Action to trigger menu key event.
     */
    @FlaggedApi(Flags.FLAG_GLOBAL_ACTION_MENU)
    public static final int GLOBAL_ACTION_MENU = 21;

    /**
     * Action to trigger media play/pause key event.
     */
    @FlaggedApi(Flags.FLAG_GLOBAL_ACTION_MEDIA_PLAY_PAUSE)
    public static final int GLOBAL_ACTION_MEDIA_PLAY_PAUSE = 22;

    private static final String LOG_TAG = "AccessibilityService";

    /**
+14 −0
Original line number Diff line number Diff line
@@ -98,6 +98,20 @@ flag {
    bug: "297595990"
}

flag {
    namespace: "accessibility"
    name: "global_action_menu"
    description: "Allow AccessibilityService to perform GLOBAL_ACTION_MENU"
    bug: "334954140"
}

flag {
    namespace: "accessibility"
    name: "global_action_media_play_pause"
    description: "Allow AccessibilityService to perform GLOBAL_ACTION_MEDIA_PLAY_PAUSE"
    bug: "334954140"
}

flag {
    namespace: "accessibility"
    name: "granular_scrolling"
+4 −0
Original line number Diff line number Diff line
@@ -5985,6 +5985,10 @@
    <string name="accessibility_system_action_hardware_a11y_shortcut_label">Accessibility Shortcut</string>
    <!-- Label for dismissing the notification shade [CHAR LIMIT=NONE] -->
    <string name="accessibility_system_action_dismiss_notification_shade">Dismiss Notification Shade</string>
     <!-- Label for menu action [CHAR LIMIT=NONE] -->
    <string name="accessibility_system_action_menu_label">Menu</string>
     <!-- Label for media play/pause action [CHAR LIMIT=NONE] -->
    <string name="accessibility_system_action_media_play_pause_label">Media Play/Pause</string>
    <!-- Label for Dpad up action [CHAR LIMIT=NONE] -->
    <string name="accessibility_system_action_dpad_up_label">Dpad Up</string>
    <!-- Label for Dpad down action [CHAR LIMIT=NONE] -->
+2 −0
Original line number Diff line number Diff line
@@ -4462,6 +4462,8 @@
  <java-symbol type="string" name="accessibility_system_action_on_screen_a11y_shortcut_chooser_label" />
  <java-symbol type="string" name="accessibility_system_action_hardware_a11y_shortcut_label" />
  <java-symbol type="string" name="accessibility_system_action_dismiss_notification_shade" />
  <java-symbol type="string" name="accessibility_system_action_menu_label" />
  <java-symbol type="string" name="accessibility_system_action_media_play_pause_label" />
  <java-symbol type="string" name="accessibility_system_action_dpad_up_label" />
  <java-symbol type="string" name="accessibility_system_action_dpad_down_label" />
  <java-symbol type="string" name="accessibility_system_action_dpad_left_label" />
Loading