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

Commit f00cd14f authored by Phil Weaver's avatar Phil Weaver
Browse files

Basic accessibility support for picture-in-picture 

Exposing actions from the PIP InputConsumer to accessibility,
stripping all actions from a covered PIP app, and adding the
InputConsumer's actions on the PIP app's root view.

We were also using an "undefined" accessibility ID to mean
three different things: a root view, a host view of a virtual
view hierarchy, and a truly undefined view. I've introduced
new values for cases where the id could be defined.

Also gathering all window IDs into one place to reduce the
chance of collisions.

Bug: 34773134
Test: In progress. Current cts passes.
Change-Id: I97269741a292cf406272bf02359c76c396f84640
parent 7219795f

api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -1779,6 +1779,7 @@ package android { 
  public static final class R.id {

    ctor public R.id();

    field public static final int accessibilityActionContextClick = 16908348; // 0x102003c

    field public static final int accessibilityActionMoveWindow = 16908354; // 0x1020042

    field public static final int accessibilityActionScrollDown = 16908346; // 0x102003a

    field public static final int accessibilityActionScrollLeft = 16908345; // 0x1020039

    field public static final int accessibilityActionScrollRight = 16908347; // 0x102003b
@@ -46937,6 +46938,8 @@ package android.view.accessibility { 
    field public static final java.lang.String ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN = "ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN";

    field public static final java.lang.String ACTION_ARGUMENT_HTML_ELEMENT_STRING = "ACTION_ARGUMENT_HTML_ELEMENT_STRING";

    field public static final java.lang.String ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT = "ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT";

    field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_X = "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_X";

    field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_Y = "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_Y";

    field public static final java.lang.String ACTION_ARGUMENT_PROGRESS_VALUE = "android.view.accessibility.action.ARGUMENT_PROGRESS_VALUE";

    field public static final java.lang.String ACTION_ARGUMENT_ROW_INT = "android.view.accessibility.action.ARGUMENT_ROW_INT";

    field public static final java.lang.String ACTION_ARGUMENT_SELECTION_END_INT = "ACTION_ARGUMENT_SELECTION_END_INT";
@@ -46993,6 +46996,7 @@ package android.view.accessibility { 
    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_EXPAND;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_FOCUS;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_LONG_CLICK;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_MOVE_WINDOW;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_NEXT_AT_MOVEMENT_GRANULARITY;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_NEXT_HTML_ELEMENT;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PASTE;
@@ -47117,6 +47121,7 @@ package android.view.accessibility { 
    method public android.view.accessibility.AccessibilityNodeInfo getRoot();

    method public java.lang.CharSequence getTitle();

    method public int getType();

    method public boolean inPictureInPicture();

    method public boolean isAccessibilityFocused();

    method public boolean isActive();

    method public boolean isFocused();

api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -1895,6 +1895,7 @@ package android { 
  public static final class R.id {

    ctor public R.id();

    field public static final int accessibilityActionContextClick = 16908348; // 0x102003c

    field public static final int accessibilityActionMoveWindow = 16908354; // 0x1020042

    field public static final int accessibilityActionScrollDown = 16908346; // 0x102003a

    field public static final int accessibilityActionScrollLeft = 16908345; // 0x1020039

    field public static final int accessibilityActionScrollRight = 16908347; // 0x102003b
@@ -50397,6 +50398,8 @@ package android.view.accessibility { 
    field public static final java.lang.String ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN = "ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN";

    field public static final java.lang.String ACTION_ARGUMENT_HTML_ELEMENT_STRING = "ACTION_ARGUMENT_HTML_ELEMENT_STRING";

    field public static final java.lang.String ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT = "ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT";

    field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_X = "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_X";

    field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_Y = "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_Y";

    field public static final java.lang.String ACTION_ARGUMENT_PROGRESS_VALUE = "android.view.accessibility.action.ARGUMENT_PROGRESS_VALUE";

    field public static final java.lang.String ACTION_ARGUMENT_ROW_INT = "android.view.accessibility.action.ARGUMENT_ROW_INT";

    field public static final java.lang.String ACTION_ARGUMENT_SELECTION_END_INT = "ACTION_ARGUMENT_SELECTION_END_INT";
@@ -50453,6 +50456,7 @@ package android.view.accessibility { 
    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_EXPAND;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_FOCUS;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_LONG_CLICK;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_MOVE_WINDOW;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_NEXT_AT_MOVEMENT_GRANULARITY;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_NEXT_HTML_ELEMENT;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PASTE;
@@ -50577,6 +50581,7 @@ package android.view.accessibility { 
    method public android.view.accessibility.AccessibilityNodeInfo getRoot();

    method public java.lang.CharSequence getTitle();

    method public int getType();

    method public boolean inPictureInPicture();

    method public boolean isAccessibilityFocused();

    method public boolean isActive();

    method public boolean isFocused();

api/test-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -1779,6 +1779,7 @@ package android { 
  public static final class R.id {

    ctor public R.id();

    field public static final int accessibilityActionContextClick = 16908348; // 0x102003c

    field public static final int accessibilityActionMoveWindow = 16908354; // 0x1020042

    field public static final int accessibilityActionScrollDown = 16908346; // 0x102003a

    field public static final int accessibilityActionScrollLeft = 16908345; // 0x1020039

    field public static final int accessibilityActionScrollRight = 16908347; // 0x102003b
@@ -47305,6 +47306,8 @@ package android.view.accessibility { 
    field public static final java.lang.String ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN = "ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN";

    field public static final java.lang.String ACTION_ARGUMENT_HTML_ELEMENT_STRING = "ACTION_ARGUMENT_HTML_ELEMENT_STRING";

    field public static final java.lang.String ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT = "ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT";

    field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_X = "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_X";

    field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_Y = "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_Y";

    field public static final java.lang.String ACTION_ARGUMENT_PROGRESS_VALUE = "android.view.accessibility.action.ARGUMENT_PROGRESS_VALUE";

    field public static final java.lang.String ACTION_ARGUMENT_ROW_INT = "android.view.accessibility.action.ARGUMENT_ROW_INT";

    field public static final java.lang.String ACTION_ARGUMENT_SELECTION_END_INT = "ACTION_ARGUMENT_SELECTION_END_INT";
@@ -47361,6 +47364,7 @@ package android.view.accessibility { 
    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_EXPAND;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_FOCUS;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_LONG_CLICK;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_MOVE_WINDOW;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_NEXT_AT_MOVEMENT_GRANULARITY;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_NEXT_HTML_ELEMENT;

    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PASTE;
@@ -47485,6 +47489,7 @@ package android.view.accessibility { 
    method public android.view.accessibility.AccessibilityNodeInfo getRoot();

    method public java.lang.CharSequence getTitle();

    method public int getType();

    method public boolean inPictureInPicture();

    method public boolean isAccessibilityFocused();

    method public boolean isActive();

    method public boolean isFocused();

core/java/android/accessibilityservice/AccessibilityService.java

+1 −1
Original line number Diff line number Diff line
@@ -1438,7 +1438,7 @@ public abstract class AccessibilityService extends Service { 
     */

    public AccessibilityNodeInfo findFocus(int focus) {

        return AccessibilityInteractionClient.getInstance().findFocus(mConnectionId,

                AccessibilityNodeInfo.ANY_WINDOW_ID, AccessibilityNodeInfo.ROOT_NODE_ID, focus);

                AccessibilityWindowInfo.ANY_WINDOW_ID, AccessibilityNodeInfo.ROOT_NODE_ID, focus);

    }



    /**

core/java/android/app/UiAutomation.java

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ public final class UiAutomation { 
     */

    public AccessibilityNodeInfo findFocus(int focus) {

        return AccessibilityInteractionClient.getInstance().findFocus(mConnectionId,

                AccessibilityNodeInfo.ANY_WINDOW_ID, AccessibilityNodeInfo.ROOT_NODE_ID, focus);

                AccessibilityWindowInfo.ANY_WINDOW_ID, AccessibilityNodeInfo.ROOT_NODE_ID, focus);

    }



    /**