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

Commit 1e275825 authored by Phil Weaver's avatar Phil Weaver Committed by Android (Google) Code Review
Browse files

Merge "Provide text locations to accessibility services."

parents d8df1b08 c2e28932

api/current.txt

+9 −0
Original line number Diff line number Diff line
@@ -44368,6 +44368,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);
@@ -45063,6 +45064,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);








@@ -46183,6 +46185,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);








@@ -46239,11 +46242,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);








@@ -46326,6 +46331,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








@@ -46407,6 +46415,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







@@ -47775,6 +47775,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);








@@ -48470,6 +48471,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);








@@ -49593,6 +49595,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);








@@ -49649,11 +49652,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);








@@ -49736,6 +49741,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








@@ -49817,6 +49825,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







@@ -44674,6 +44674,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);








@@ -45370,6 +45371,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);








@@ -46494,6 +46496,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);








@@ -46550,11 +46553,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);








@@ -46638,6 +46643,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








@@ -46719,6 +46727,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,