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

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

Provide text locations to accessibility services. 

Bug: 30170631
Test: New CTS tests on linked CL.
Change-Id: I723e3777189c8df71c59dada00abdf339ebc983d
parent 0fcdf439

api/current.txt

+9 −0
Original line number Diff line number Diff line
@@ -44025,6 +44025,7 @@ package android.view { 
    ctor public View(android.content.Context, android.util.AttributeSet, int);

    ctor public View(android.content.Context, android.util.AttributeSet, int, int);

    method public void addChildrenForAccessibility(java.util.ArrayList<android.view.View>);

    method public void addExtraDataToAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo, java.lang.String, android.os.Bundle);

    method public void addFocusables(java.util.ArrayList<android.view.View>, int);

    method public void addFocusables(java.util.ArrayList<android.view.View>, int, int);

    method public void addKeyboardNavigationClusters(java.util.Collection<android.view.View>, int);
@@ -44721,6 +44722,7 @@ package android.view { 














  public static class View.AccessibilityDelegate {















    ctor public View.AccessibilityDelegate();













    method public void addExtraDataToAccessibilityNodeInfo(android.view.View, android.view.accessibility.AccessibilityNodeInfo, java.lang.String, android.os.Bundle);















    method public boolean dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);















    method public android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider(android.view.View);















    method public void onInitializeAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);










@@ -45838,6 +45840,7 @@ package android.view.accessibility {













    method public android.view.accessibility.AccessibilityNodeInfo focusSearch(int);















    method public java.util.List<android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction> getActionList();















    method public deprecated int getActions();













    method public java.util.List<java.lang.String> getAvailableExtraData();















    method public void getBoundsInParent(android.graphics.Rect);















    method public void getBoundsInScreen(android.graphics.Rect);















    method public android.view.accessibility.AccessibilityNodeInfo getChild(int);










@@ -45894,11 +45897,13 @@ package android.view.accessibility {













    method public boolean performAction(int, android.os.Bundle);















    method public void recycle();















    method public boolean refresh();













    method public boolean refreshWithExtraData(java.lang.String, android.os.Bundle);















    method public deprecated void removeAction(int);















    method public boolean removeAction(android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction);















    method public boolean removeChild(android.view.View);















    method public boolean removeChild(android.view.View, int);















    method public void setAccessibilityFocused(boolean);













    method public void setAvailableExtraData(java.util.List<java.lang.String>);















    method public void setBoundsInParent(android.graphics.Rect);















    method public void setBoundsInScreen(android.graphics.Rect);















    method public void setCanOpenPopup(boolean);










@@ -45981,6 +45986,9 @@ package android.view.accessibility {













    field public static final int ACTION_SET_SELECTION = 131072; // 0x20000















    field public static final int ACTION_SET_TEXT = 2097152; // 0x200000















    field public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityNodeInfo> CREATOR;













    field public static final java.lang.String EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH";













    field public static final java.lang.String EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX";













    field public static final java.lang.String EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_KEY";















    field public static final int FOCUS_ACCESSIBILITY = 2; // 0x2















    field public static final int FOCUS_INPUT = 1; // 0x1















    field public static final int MOVEMENT_GRANULARITY_CHARACTER = 1; // 0x1










@@ -46062,6 +46070,7 @@ package android.view.accessibility {



























  public abstract class AccessibilityNodeProvider {















    ctor public AccessibilityNodeProvider();













    method public void addExtraDataToAccessibilityNodeInfo(int, android.view.accessibility.AccessibilityNodeInfo, java.lang.String, android.os.Bundle);















    method public android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo(int);















    method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByText(java.lang.String, int);















    method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);

























api/system-current.txt



+9
−0




























Original line number
Diff line number
Diff line








@@ -47431,6 +47431,7 @@ package android.view {













    ctor public View(android.content.Context, android.util.AttributeSet, int);















    ctor public View(android.content.Context, android.util.AttributeSet, int, int);















    method public void addChildrenForAccessibility(java.util.ArrayList<android.view.View>);













    method public void addExtraDataToAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo, java.lang.String, android.os.Bundle);















    method public void addFocusables(java.util.ArrayList<android.view.View>, int);















    method public void addFocusables(java.util.ArrayList<android.view.View>, int, int);















    method public void addKeyboardNavigationClusters(java.util.Collection<android.view.View>, int);










@@ -48127,6 +48128,7 @@ package android.view {



























  public static class View.AccessibilityDelegate {















    ctor public View.AccessibilityDelegate();













    method public void addExtraDataToAccessibilityNodeInfo(android.view.View, android.view.accessibility.AccessibilityNodeInfo, java.lang.String, android.os.Bundle);















    method public boolean dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);















    method public android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider(android.view.View);















    method public void onInitializeAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);










@@ -49247,6 +49249,7 @@ package android.view.accessibility {













    method public android.view.accessibility.AccessibilityNodeInfo focusSearch(int);















    method public java.util.List<android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction> getActionList();















    method public deprecated int getActions();













    method public java.util.List<java.lang.String> getAvailableExtraData();















    method public void getBoundsInParent(android.graphics.Rect);















    method public void getBoundsInScreen(android.graphics.Rect);















    method public android.view.accessibility.AccessibilityNodeInfo getChild(int);










@@ -49303,11 +49306,13 @@ package android.view.accessibility {













    method public boolean performAction(int, android.os.Bundle);















    method public void recycle();















    method public boolean refresh();













    method public boolean refreshWithExtraData(java.lang.String, android.os.Bundle);















    method public deprecated void removeAction(int);















    method public boolean removeAction(android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction);















    method public boolean removeChild(android.view.View);















    method public boolean removeChild(android.view.View, int);















    method public void setAccessibilityFocused(boolean);













    method public void setAvailableExtraData(java.util.List<java.lang.String>);















    method public void setBoundsInParent(android.graphics.Rect);















    method public void setBoundsInScreen(android.graphics.Rect);















    method public void setCanOpenPopup(boolean);










@@ -49390,6 +49395,9 @@ package android.view.accessibility {













    field public static final int ACTION_SET_SELECTION = 131072; // 0x20000















    field public static final int ACTION_SET_TEXT = 2097152; // 0x200000















    field public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityNodeInfo> CREATOR;













    field public static final java.lang.String EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH";













    field public static final java.lang.String EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX";













    field public static final java.lang.String EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_KEY";















    field public static final int FOCUS_ACCESSIBILITY = 2; // 0x2















    field public static final int FOCUS_INPUT = 1; // 0x1















    field public static final int MOVEMENT_GRANULARITY_CHARACTER = 1; // 0x1










@@ -49471,6 +49479,7 @@ package android.view.accessibility {



























  public abstract class AccessibilityNodeProvider {















    ctor public AccessibilityNodeProvider();













    method public void addExtraDataToAccessibilityNodeInfo(int, android.view.accessibility.AccessibilityNodeInfo, java.lang.String, android.os.Bundle);















    method public android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo(int);















    method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByText(java.lang.String, int);















    method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);

























api/test-current.txt



+9
−0




























Original line number
Diff line number
Diff line








@@ -44331,6 +44331,7 @@ package android.view {













    ctor public View(android.content.Context, android.util.AttributeSet, int);















    ctor public View(android.content.Context, android.util.AttributeSet, int, int);















    method public void addChildrenForAccessibility(java.util.ArrayList<android.view.View>);













    method public void addExtraDataToAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo, java.lang.String, android.os.Bundle);















    method public void addFocusables(java.util.ArrayList<android.view.View>, int);















    method public void addFocusables(java.util.ArrayList<android.view.View>, int, int);















    method public void addKeyboardNavigationClusters(java.util.Collection<android.view.View>, int);










@@ -45028,6 +45029,7 @@ package android.view {



























  public static class View.AccessibilityDelegate {















    ctor public View.AccessibilityDelegate();













    method public void addExtraDataToAccessibilityNodeInfo(android.view.View, android.view.accessibility.AccessibilityNodeInfo, java.lang.String, android.os.Bundle);















    method public boolean dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);















    method public android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider(android.view.View);















    method public void onInitializeAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);










@@ -46149,6 +46151,7 @@ package android.view.accessibility {













    method public android.view.accessibility.AccessibilityNodeInfo focusSearch(int);















    method public java.util.List<android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction> getActionList();















    method public deprecated int getActions();













    method public java.util.List<java.lang.String> getAvailableExtraData();















    method public void getBoundsInParent(android.graphics.Rect);















    method public void getBoundsInScreen(android.graphics.Rect);















    method public android.view.accessibility.AccessibilityNodeInfo getChild(int);










@@ -46205,11 +46208,13 @@ package android.view.accessibility {













    method public boolean performAction(int, android.os.Bundle);















    method public void recycle();















    method public boolean refresh();













    method public boolean refreshWithExtraData(java.lang.String, android.os.Bundle);















    method public deprecated void removeAction(int);















    method public boolean removeAction(android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction);















    method public boolean removeChild(android.view.View);















    method public boolean removeChild(android.view.View, int);















    method public void setAccessibilityFocused(boolean);













    method public void setAvailableExtraData(java.util.List<java.lang.String>);















    method public void setBoundsInParent(android.graphics.Rect);















    method public void setBoundsInScreen(android.graphics.Rect);















    method public void setCanOpenPopup(boolean);










@@ -46293,6 +46298,9 @@ package android.view.accessibility {













    field public static final int ACTION_SET_SELECTION = 131072; // 0x20000















    field public static final int ACTION_SET_TEXT = 2097152; // 0x200000















    field public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityNodeInfo> CREATOR;













    field public static final java.lang.String EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH";













    field public static final java.lang.String EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX";













    field public static final java.lang.String EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_KEY";















    field public static final int FOCUS_ACCESSIBILITY = 2; // 0x2















    field public static final int FOCUS_INPUT = 1; // 0x1















    field public static final int MOVEMENT_GRANULARITY_CHARACTER = 1; // 0x1










@@ -46374,6 +46382,7 @@ package android.view.accessibility {



























  public abstract class AccessibilityNodeProvider {















    ctor public AccessibilityNodeProvider();













    method public void addExtraDataToAccessibilityNodeInfo(int, android.view.accessibility.AccessibilityNodeInfo, java.lang.String, android.os.Bundle);















    method public android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo(int);















    method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByText(java.lang.String, int);















    method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);

























core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl



+2
−1




























Original line number
Diff line number
Diff line








@@ -37,7 +37,8 @@ interface IAccessibilityServiceConnection {





























    boolean findAccessibilityNodeInfoByAccessibilityId(int accessibilityWindowId,















        long accessibilityNodeId, int interactionId,













        IAccessibilityInteractionConnectionCallback callback, int flags, long threadId);













        IAccessibilityInteractionConnectionCallback callback, int flags, long threadId,













        in Bundle arguments);































    boolean findAccessibilityNodeInfosByText(int accessibilityWindowId, long accessibilityNodeId,















        String text, int interactionId, IAccessibilityInteractionConnectionCallback callback,

































core/java/android/view/AccessibilityInteractionController.java



+126
−198


























File changed.
Preview size limit exceeded, changes collapsed.