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

Commit 166cf61c authored by Riley Jones's avatar Riley Jones Committed by Android (Google) Code Review
Browse files

Merge "Adding definitions for AccessibilityAction directional swipes. Test: CL... 

Merge "Adding definitions for AccessibilityAction directional swipes. Test: CL adds definitions - existing unit tests should still work."
parents df08d493 0de71ca5

core/api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -2040,6 +2040,10 @@ package android { 
    field public static final int accessibilityActionSetProgress = 16908349; // 0x102003d

    field public static final int accessibilityActionShowOnScreen = 16908342; // 0x1020036

    field public static final int accessibilityActionShowTooltip = 16908356; // 0x1020044

    field public static final int accessibilityActionSwipeDown;

    field public static final int accessibilityActionSwipeLeft;

    field public static final int accessibilityActionSwipeRight;

    field public static final int accessibilityActionSwipeUp;

    field public static final int accessibilitySystemActionBack = 16908363; // 0x102004b

    field public static final int accessibilitySystemActionHome = 16908364; // 0x102004c

    field public static final int accessibilitySystemActionLockScreen = 16908370; // 0x1020052
@@ -51183,6 +51187,10 @@ package android.view.accessibility { 
    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_TEXT;

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

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

    field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_DOWN;

    field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_LEFT;

    field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_RIGHT;

    field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_UP;

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

  }

























core/java/android/view/accessibility/AccessibilityNodeInfo.java



+24
−0




























Original line number
Diff line number
Diff line








@@ -5075,6 +5075,30 @@ public class AccessibilityNodeInfo implements Parcelable {













        @NonNull public static final AccessibilityAction ACTION_DRAG_CANCEL =















                new AccessibilityAction(R.id.accessibilityActionDragCancel);





























        /**













         * Action to perform a left swipe.













         */













        @NonNull public static final AccessibilityAction ACTION_SWIPE_LEFT =













                new AccessibilityAction(R.id.accessibilityActionSwipeLeft);



























        /**













         * Action to perform a right swipe.













         */













        @NonNull public static final AccessibilityAction ACTION_SWIPE_RIGHT =













            new AccessibilityAction(R.id.accessibilityActionSwipeRight);



























        /**













         * Action to perform an up swipe.













         */













        @NonNull public static final AccessibilityAction ACTION_SWIPE_UP =













            new AccessibilityAction(R.id.accessibilityActionSwipeUp);



























        /**













         * Action to perform a down swipe.













         */













        @NonNull public static final AccessibilityAction ACTION_SWIPE_DOWN =













            new AccessibilityAction(R.id.accessibilityActionSwipeDown);





























        private final int mActionId;















        private final CharSequence mLabel;

















































core/res/res/values/ids.xml



+12
−0




























Original line number
Diff line number
Diff line








@@ -263,6 +263,18 @@













  <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_DRAG_CANCEL}. -->















  <item type="id" name="accessibilityActionDragCancel" />





























  <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SWIPE_LEFT}. -->













  <item type="id" name="accessibilityActionSwipeLeft" />



























  <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SWIPE_RIGHT}. -->













  <item type="id" name="accessibilityActionSwipeRight" />



























  <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SWIPE_UP}. -->













  <item type="id" name="accessibilityActionSwipeUp" />



























  <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SWIPE_DOWN}. -->













  <item type="id" name="accessibilityActionSwipeDown" />





























  <!-- View tag for remote views to store the index of the next child when adding nested remote views dynamically. -->















  <item type="id" name="remote_views_next_child" />

















































core/res/res/values/public.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -3306,6 +3306,10 @@













  </staging-public-group>































  <staging-public-group type="id" first-id="0x01de0000">













    <public name="accessibilityActionSwipeLeft" />













    <public name="accessibilityActionSwipeRight" />













    <public name="accessibilityActionSwipeUp" />













    <public name="accessibilityActionSwipeDown" />















  </staging-public-group>































  <staging-public-group type="style" first-id="0x0dfd0000">