Merge "Rename AccessibilityGestureInfo" (a5cd980c) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -2812,12 +2812,12 @@ package android.accessibilityservice {
		method public void onClicked(android.accessibilityservice.AccessibilityButtonController);
		}

		public final class AccessibilityGestureInfo implements android.os.Parcelable {
		public final class AccessibilityGestureEvent implements android.os.Parcelable {
		method public int describeContents();
		method public int getDisplayId();
		method public int getGestureId();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.accessibilityservice.AccessibilityGestureInfo> CREATOR;
		field @NonNull public static final android.os.Parcelable.Creator<android.accessibilityservice.AccessibilityGestureEvent> CREATOR;
		}

		public abstract class AccessibilityService extends android.app.Service {
		@@ -2836,7 +2836,7 @@ package android.accessibilityservice {
		method public abstract void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
		method public final android.os.IBinder onBind(android.content.Intent);
		method @Deprecated protected boolean onGesture(int);
		method public boolean onGesture(@NonNull android.accessibilityservice.AccessibilityGestureInfo);
		method public boolean onGesture(@NonNull android.accessibilityservice.AccessibilityGestureEvent);
		method public abstract void onInterrupt();
		method protected boolean onKeyEvent(android.view.KeyEvent);
		method protected void onServiceConnected();

api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ package android {

		package android.accessibilityservice {

		public final class AccessibilityGestureInfo implements android.os.Parcelable {
		ctor public AccessibilityGestureInfo(int, int);
		public final class AccessibilityGestureEvent implements android.os.Parcelable {
		ctor public AccessibilityGestureEvent(int, int);
		}

		}

core/java/android/accessibilityservice/AccessibilityGestureInfo.aidl→core/java/android/accessibilityservice/AccessibilityGestureEvent.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,4 +16,4 @@

		package android.accessibilityservice;

		parcelable AccessibilityGestureInfo;
		parcelable AccessibilityGestureEvent;

core/java/android/accessibilityservice/AccessibilityGestureInfo.java→core/java/android/accessibilityservice/AccessibilityGestureEvent.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -44,17 +44,17 @@ import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

		/**
		* This class describes the gesture information including gesture id and which display it happens
		* This class describes the gesture event including gesture id and which display it happens
		* on.
		* <p>
		* <strong>Note:</strong> Accessibility services setting the
		* {@link android.accessibilityservice.AccessibilityServiceInfo#FLAG_REQUEST_TOUCH_EXPLORATION_MODE}
		* flag can receive gestures.
		*
		* @see AccessibilityService#onGesture(AccessibilityGestureInfo)
		* @see AccessibilityService#onGesture(AccessibilityGestureEvent)
		*/

		public final class AccessibilityGestureInfo implements Parcelable {
		public final class AccessibilityGestureEvent implements Parcelable {

		/** @hide */
		@IntDef(prefix = { "GESTURE_" }, value = {
		@@ -84,12 +84,12 @@ public final class AccessibilityGestureInfo implements Parcelable {

		/** @hide */
		@TestApi
		public AccessibilityGestureInfo(int gestureId, int displayId) {
		public AccessibilityGestureEvent(int gestureId, int displayId) {
		mGestureId = gestureId;
		mDisplayId = displayId;
		}

		private AccessibilityGestureInfo(@NonNull Parcel parcel) {
		private AccessibilityGestureEvent(@NonNull Parcel parcel) {
		mGestureId = parcel.readInt();
		mDisplayId = parcel.readInt();
		}
		@@ -117,7 +117,7 @@ public final class AccessibilityGestureInfo implements Parcelable {
		@NonNull
		@Override
		public String toString() {
		StringBuilder stringBuilder = new StringBuilder("AccessibilityGestureInfo[");
		StringBuilder stringBuilder = new StringBuilder("AccessibilityGestureEvent[");
		stringBuilder.append("gestureId: ").append(mGestureId);
		stringBuilder.append(", ");
		stringBuilder.append("displayId: ").append(mDisplayId);
		@@ -142,14 +142,14 @@ public final class AccessibilityGestureInfo implements Parcelable {
		/**
		* @see Parcelable.Creator
		*/
		public static final @NonNull Parcelable.Creator<AccessibilityGestureInfo> CREATOR =
		new Parcelable.Creator<AccessibilityGestureInfo>() {
		public AccessibilityGestureInfo createFromParcel(Parcel parcel) {
		return new AccessibilityGestureInfo(parcel);
		public static final @NonNull Parcelable.Creator<AccessibilityGestureEvent> CREATOR =
		new Parcelable.Creator<AccessibilityGestureEvent>() {
		public AccessibilityGestureEvent createFromParcel(Parcel parcel) {
		return new AccessibilityGestureEvent(parcel);
		}

		public AccessibilityGestureInfo[] newArray(int size) {
		return new AccessibilityGestureInfo[size];
		public AccessibilityGestureEvent[] newArray(int size) {
		return new AccessibilityGestureEvent[size];
		}
		};

core/java/android/accessibilityservice/AccessibilityService.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -382,7 +382,7 @@ public abstract class AccessibilityService extends Service {
		void onServiceConnected();
		void init(int connectionId, IBinder windowToken);
		/** The detected gesture information for different displays */
		boolean onGesture(AccessibilityGestureInfo gestureInfo);
		boolean onGesture(AccessibilityGestureEvent gestureInfo);
		boolean onKeyEvent(KeyEvent event);
		/** Magnification changed callbacks for different displays */
		void onMagnificationChanged(int displayId, @NonNull Region region,
		@@ -517,7 +517,7 @@ public abstract class AccessibilityService extends Service {
		}

		/**
		* Called by {@link #onGesture(AccessibilityGestureInfo)} when the user performs a specific
		* Called by {@link #onGesture(AccessibilityGestureEvent)} when the user performs a specific
		* gesture on the default display.
		*
		* <strong>Note:</strong> To receive gestures an accessibility service must
		@@ -528,7 +528,7 @@ public abstract class AccessibilityService extends Service {
		* @param gestureId The unique id of the performed gesture.
		*
		* @return Whether the gesture was handled.
		* @deprecated Override {@link #onGesture(AccessibilityGestureInfo)} instead.
		* @deprecated Override {@link #onGesture(AccessibilityGestureEvent)} instead.
		*
		* @see #GESTURE_SWIPE_UP
		* @see #GESTURE_SWIPE_UP_AND_LEFT
		@@ -564,14 +564,14 @@ public abstract class AccessibilityService extends Service {
		* <strong>Note:</strong> The default implementation calls {@link #onGesture(int)} when the
		* touch screen is default display.
		*
		* @param gestureInfo The information of gesture.
		* @param gestureEvent The information of gesture.
		*
		* @return Whether the gesture was handled.
		*
		*/
		public boolean onGesture(@NonNull AccessibilityGestureInfo gestureInfo) {
		if (gestureInfo.getDisplayId() == Display.DEFAULT_DISPLAY) {
		onGesture(gestureInfo.getGestureId());
		public boolean onGesture(@NonNull AccessibilityGestureEvent gestureEvent) {
		if (gestureEvent.getDisplayId() == Display.DEFAULT_DISPLAY) {
		onGesture(gestureEvent.getGestureId());
		}
		return false;
		}
		@@ -1725,8 +1725,8 @@ public abstract class AccessibilityService extends Service {
		}

		@Override
		public boolean onGesture(AccessibilityGestureInfo gestureInfo) {
		return AccessibilityService.this.onGesture(gestureInfo);
		public boolean onGesture(AccessibilityGestureEvent gestureEvent) {
		return AccessibilityService.this.onGesture(gestureEvent);
		}

		@Override
		@@ -1826,7 +1826,7 @@ public abstract class AccessibilityService extends Service {
		}

		@Override
		public void onGesture(AccessibilityGestureInfo gestureInfo) {
		public void onGesture(AccessibilityGestureEvent gestureInfo) {
		Message message = mCaller.obtainMessageO(DO_ON_GESTURE, gestureInfo);
		mCaller.sendMessage(message);
		}
		@@ -1942,7 +1942,7 @@ public abstract class AccessibilityService extends Service {

		case DO_ON_GESTURE: {
		if (mConnectionId != AccessibilityInteractionClient.NO_ID) {
		mCallback.onGesture((AccessibilityGestureInfo) message.obj);
		mCallback.onGesture((AccessibilityGestureEvent) message.obj);
		}
		} return;