Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename AccessibilityGestureInfo

Browse Source 
Rename AccessibilityGestureInfo to AccessibilityGestureEvent

Bug: 139127300
Test: atest AccessibilityGestureDetectorTest
Test: atest AccessibilityGestureEventTest
Change-Id: I1f08d89fbb6df30d48d424ff62cfa6b35d5e9430
This commit is contained in:
RyanlwLin
2019-09-02 21:22:09 +08:00
parent b5a6fc2677
commit 0d17f046bc
12 changed files with 62 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -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();

4
api/test-current.txt
View File

@@ -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);
}
}

2
core/java/android/accessibilityservice/AccessibilityGestureInfo.aidl → core/java/android/accessibilityservice/AccessibilityGestureEvent.aidl
View File

@@ -16,4 +16,4 @@
package android.accessibilityservice;
parcelable AccessibilityGestureInfo;
parcelable AccessibilityGestureEvent;

24
core/java/android/accessibilityservice/AccessibilityGestureInfo.java → core/java/android/accessibilityservice/AccessibilityGestureEvent.java
View File

@@ -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];
}
};

22
core/java/android/accessibilityservice/AccessibilityService.java
View File

@@ -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;

4
core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl
View File

@@ -20,7 +20,7 @@ import android.accessibilityservice.IAccessibilityServiceConnection;
import android.graphics.Region;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityWindowInfo;
import android.accessibilityservice.AccessibilityGestureInfo;
import android.accessibilityservice.AccessibilityGestureEvent;
import android.view.KeyEvent;
/**
@@ -36,7 +36,7 @@ import android.view.KeyEvent;
void onInterrupt();
void onGesture(in AccessibilityGestureInfo gestureInfo);
void onGesture(in AccessibilityGestureEvent gestureEvent);
void clearAccessibilityCache();

4
core/java/android/app/UiAutomation.java
View File

@@ -16,7 +16,7 @@
package android.app;
import android.accessibilityservice.AccessibilityGestureInfo;
import android.accessibilityservice.AccessibilityGestureEvent;
import android.accessibilityservice.AccessibilityService.Callbacks;
import android.accessibilityservice.AccessibilityService.IAccessibilityServiceClientWrapper;
import android.accessibilityservice.AccessibilityServiceInfo;
@@ -1246,7 +1246,7 @@ public final class UiAutomation {
}
@Override
public boolean onGesture(AccessibilityGestureInfo gestureInfo) {
public boolean onGesture(AccessibilityGestureEvent gestureEvent) {
/* do nothing */
return false;
}

10
services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java
View File

@@ -23,7 +23,7 @@ import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLEAR_ACCE
import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK;
import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK;
import android.accessibilityservice.AccessibilityGestureInfo;
import android.accessibilityservice.AccessibilityGestureEvent;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.accessibilityservice.IAccessibilityServiceClient;
import android.accessibilityservice.IAccessibilityServiceConnection;
@@ -1168,9 +1168,9 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ
}
}
public void notifyGesture(AccessibilityGestureInfo gestureInfo) {
public void notifyGesture(AccessibilityGestureEvent gestureEvent) {
mInvocationHandler.obtainMessage(InvocationHandler.MSG_ON_GESTURE,
gestureInfo).sendToTarget();
gestureEvent).sendToTarget();
}
public void notifyClearAccessibilityNodeInfoCache() {
@@ -1259,7 +1259,7 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ
}
}
private void notifyGestureInternal(AccessibilityGestureInfo gestureInfo) {
private void notifyGestureInternal(AccessibilityGestureEvent gestureInfo) {
final IAccessibilityServiceClient listener = getServiceInterfaceSafely();
if (listener != null) {
try {
@@ -1464,7 +1464,7 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ
final int type = message.what;
switch (type) {
case MSG_ON_GESTURE: {
notifyGestureInternal((AccessibilityGestureInfo) message.obj);
notifyGestureInternal((AccessibilityGestureEvent) message.obj);
} break;
case MSG_CLEAR_ACCESSIBILITY_CACHE: {

19
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -27,7 +27,7 @@ import static com.android.internal.util.FunctionalUtils.ignoreRemoteException;
import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;
import android.Manifest;
import android.accessibilityservice.AccessibilityGestureInfo;
import android.accessibilityservice.AccessibilityGestureEvent;
import android.accessibilityservice.AccessibilityService;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.accessibilityservice.IAccessibilityServiceClient;
@@ -821,12 +821,17 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
}
}
public boolean onGesture(AccessibilityGestureInfo gestureInfo) {
/**
* Called when a gesture is detected on a display.
*
* @param gestureEvent the detail of the gesture.
* @return true if the event is handled.
*/
public boolean onGesture(AccessibilityGestureEvent gestureEvent) {
synchronized (mLock) {
boolean handled = notifyGestureLocked(gestureInfo, false);
boolean handled = notifyGestureLocked(gestureEvent, false);
if (!handled) {
handled = notifyGestureLocked(gestureInfo, true);
handled = notifyGestureLocked(gestureEvent, true);
}
return handled;
}
@@ -1021,7 +1026,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
}
}
private boolean notifyGestureLocked(AccessibilityGestureInfo gestureInfo, boolean isDefault) {
private boolean notifyGestureLocked(AccessibilityGestureEvent gestureEvent, boolean isDefault) {
// TODO: Now we are giving the gestures to the last enabled
// service that can handle them which is the last one
// in our list since we write the last enabled as the
@@ -1035,7 +1040,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
for (int i = state.mBoundServices.size() - 1; i >= 0; i--) {
AccessibilityServiceConnection service = state.mBoundServices.get(i);
if (service.mRequestTouchExplorationMode && service.mIsDefault == isDefault) {
service.notifyGesture(gestureInfo);
service.notifyGesture(gestureEvent);
return true;
}
}

16
services/accessibility/java/com/android/server/accessibility/gestures/AccessibilityGestureDetector.java
View File

@@ -16,7 +16,7 @@
package com.android.server.accessibility.gestures;
import android.accessibilityservice.AccessibilityGestureInfo;
import android.accessibilityservice.AccessibilityGestureEvent;
import android.accessibilityservice.AccessibilityService;
import android.content.Context;
import android.gesture.GesturePoint;
@@ -119,11 +119,11 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen
/**
* Called when an event stream is recognized as a gesture.
*
* @param gestureInfo Information about the gesture.
* @param gestureEvent Information about the gesture.
*
* @return true if the event is consumed, else false
*/
boolean onGestureCompleted(AccessibilityGestureInfo gestureInfo);
boolean onGestureCompleted(AccessibilityGestureEvent gestureEvent);
/**
* Called when the system has decided an event stream doesn't match any
@@ -567,19 +567,19 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen
switch (direction) {
case LEFT:
return mListener.onGestureCompleted(
new AccessibilityGestureInfo(AccessibilityService.GESTURE_SWIPE_LEFT,
new AccessibilityGestureEvent(AccessibilityService.GESTURE_SWIPE_LEFT,
displayId));
case RIGHT:
return mListener.onGestureCompleted(
new AccessibilityGestureInfo(AccessibilityService.GESTURE_SWIPE_RIGHT,
new AccessibilityGestureEvent(AccessibilityService.GESTURE_SWIPE_RIGHT,
displayId));
case UP:
return mListener.onGestureCompleted(
new AccessibilityGestureInfo(AccessibilityService.GESTURE_SWIPE_UP,
new AccessibilityGestureEvent(AccessibilityService.GESTURE_SWIPE_UP,
displayId));
case DOWN:
return mListener.onGestureCompleted(
new AccessibilityGestureInfo(AccessibilityService.GESTURE_SWIPE_DOWN,
new AccessibilityGestureEvent(AccessibilityService.GESTURE_SWIPE_DOWN,
displayId));
default:
// Do nothing.
@@ -600,7 +600,7 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen
int segmentDirection1 = toDirection(dX1, dY1);
int gestureId = DIRECTIONS_TO_GESTURE_ID[segmentDirection0][segmentDirection1];
return mListener.onGestureCompleted(
new AccessibilityGestureInfo(gestureId, displayId));
new AccessibilityGestureEvent(gestureId, displayId));
}
// else if (path.size() < 2 || 3 < path.size()) then no gesture recognized.
return mListener.onGestureCancelled(event, policyFlags);

6
services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java
View File

@@ -20,7 +20,7 @@ import static android.view.MotionEvent.INVALID_POINTER_ID;
import static com.android.server.accessibility.gestures.TouchState.ALL_POINTER_ID_BITS;
import android.accessibilityservice.AccessibilityGestureInfo;
import android.accessibilityservice.AccessibilityGestureEvent;
import android.content.Context;
import android.graphics.Point;
import android.os.Handler;
@@ -343,14 +343,14 @@ public class TouchExplorer extends BaseEventStreamTransformation
}
@Override
public boolean onGestureCompleted(AccessibilityGestureInfo gestureInfo) {
public boolean onGestureCompleted(AccessibilityGestureEvent gestureEvent) {
if (!mState.isGestureDetecting()) {
return false;
}
endGestureDetection(true);
mAms.onGesture(gestureInfo);
mAms.onGesture(gestureEvent);
return true;
}

2
services/tests/servicestests/src/com/android/server/accessibility/gestures/AccessibilityGestureDetectorTest.java
View File

@@ -176,6 +176,6 @@ public class AccessibilityGestureDetectorTest {
// Check that correct gesture was recognized.
verify(mResultListener).onGestureCompleted(
argThat(gestureInfo -> gestureInfo.getGestureId() == gestureId));
argThat(gestureEvent -> gestureEvent.getGestureId() == gestureId));
}
}