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

Commit d6a53cc8 authored by Sally Yuen's avatar Sally Yuen Committed by Automerger Merge Worker
Browse files

Merge "Add drag and drop event ids to intdef" into sc-v2-dev am: 349f251a am: ac737ddf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16032747

Change-Id: Ieadd15d2a3a684072717fba05c2f72e4216a0042
parents 91946774 ac737ddf

core/java/android/view/accessibility/AccessibilityEvent.java

+8 −1
Original line number Diff line number Diff line
@@ -740,7 +740,10 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par 
                    CONTENT_CHANGE_TYPE_STATE_DESCRIPTION,

                    CONTENT_CHANGE_TYPE_PANE_TITLE,

                    CONTENT_CHANGE_TYPE_PANE_APPEARED,

                    CONTENT_CHANGE_TYPE_PANE_DISAPPEARED

                    CONTENT_CHANGE_TYPE_PANE_DISAPPEARED,

                    CONTENT_CHANGE_TYPE_DRAG_STARTED,

                    CONTENT_CHANGE_TYPE_DRAG_DROPPED,

                    CONTENT_CHANGE_TYPE_DRAG_CANCELLED

            })

    public @interface ContentChangeTypes {}
@@ -989,6 +992,9 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par 
            case CONTENT_CHANGE_TYPE_PANE_APPEARED: return "CONTENT_CHANGE_TYPE_PANE_APPEARED";

            case CONTENT_CHANGE_TYPE_PANE_DISAPPEARED:

                return "CONTENT_CHANGE_TYPE_PANE_DISAPPEARED";

            case CONTENT_CHANGE_TYPE_DRAG_STARTED: return "CONTENT_CHANGE_TYPE_DRAG_STARTED";

            case CONTENT_CHANGE_TYPE_DRAG_DROPPED: return "CONTENT_CHANGE_TYPE_DRAG_DROPPED";

            case CONTENT_CHANGE_TYPE_DRAG_CANCELLED: return "CONTENT_CHANGE_TYPE_DRAG_CANCELLED";

            default: return Integer.toHexString(type);

        }

    }
@@ -1047,6 +1053,7 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par 
    /**

     * Sets the event type.

     *

     * <b>Note: An event must represent a single event type.</b>

     * @param eventType The event type.

     *

     * @throws IllegalStateException If called from an AccessibilityService.