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

Merge "Rename FingerprintGestureCallback.onGesture" into oc-dev am: cfbe105e4b

Browse Source 
am: c8885742db

Change-Id: I651bb7f6a3909b357cc07c015dbe21f5623b7809
This commit is contained in:
Phil Weaver
2017-04-28 04:04:14 +00:00
committed by android-build-merger
parent 96a9d4267c c8885742db
commit 95e44168ec
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -2877,7 +2877,8 @@ package android.accessibilityservice {
public static abstract class FingerprintGestureController.FingerprintGestureCallback {
ctor public FingerprintGestureController.FingerprintGestureCallback();
method public void onGesture(int);
method public deprecated void onGesture(int);
method public void onGestureDetected(int);
method public void onGestureDetectionAvailabilityChanged(boolean);
}

3
api/system-current.txt
View File

@@ -3005,7 +3005,8 @@ package android.accessibilityservice {
public static abstract class FingerprintGestureController.FingerprintGestureCallback {
ctor public FingerprintGestureController.FingerprintGestureCallback();
method public void onGesture(int);
method public deprecated void onGesture(int);
method public void onGestureDetected(int);
method public void onGestureDetectionAvailabilityChanged(boolean);
}

3
api/test-current.txt
View File

@@ -2877,7 +2877,8 @@ package android.accessibilityservice {
public static abstract class FingerprintGestureController.FingerprintGestureCallback {
ctor public FingerprintGestureController.FingerprintGestureCallback();
method public void onGesture(int);
method public deprecated void onGesture(int);
method public void onGestureDetected(int);
method public void onGestureDetectionAvailabilityChanged(boolean);
}

10
core/java/android/accessibilityservice/FingerprintGestureController.java
View File

@@ -156,9 +156,9 @@ public final class FingerprintGestureController {
FingerprintGestureCallback callback = handlerMap.keyAt(i);
Handler handler = handlerMap.valueAt(i);
if (handler != null) {
handler.post(() -> callback.onGesture(gesture));
handler.post(() -> callback.onGestureDetected(gesture));
} else {
callback.onGesture(gesture);
callback.onGestureDetected(gesture);
}
}
}
@@ -180,6 +180,12 @@ public final class FingerprintGestureController {
* @param gesture The id of the gesture that was detected. For example,
* {@link #FINGERPRINT_GESTURE_SWIPE_RIGHT}.
*/
public void onGestureDetected(int gesture) {}
/**
* @deprecated Never called. Use onGestureDetected.
*/
@Deprecated
public void onGesture(int gesture) {}
}
}

6
services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureControllerTest.java
View File

@@ -131,7 +131,7 @@ public class FingerprintGestureControllerTest {
mFingerprintGestureController.registerFingerprintGestureCallback(
mMockFingerprintGestureCallback, null);
mFingerprintGestureController.onGesture(FINGERPRINT_GESTURE_SWIPE_DOWN);
verify(mMockFingerprintGestureCallback, times(1)).onGesture(FINGERPRINT_GESTURE_SWIPE_DOWN);
verify(mMockFingerprintGestureCallback, times(1)).onGestureDetected(FINGERPRINT_GESTURE_SWIPE_DOWN);
reset(mMockFingerprintGestureCallback);
mFingerprintGestureController.unregisterFingerprintGestureCallback(
@@ -150,9 +150,9 @@ public class FingerprintGestureControllerTest {
mFingerprintGestureController.registerFingerprintGestureCallback(
mMockFingerprintGestureCallback, messageCapturingHandler);
mFingerprintGestureController.onGesture(FINGERPRINT_GESTURE_SWIPE_DOWN);
verify(mMockFingerprintGestureCallback, times(0)).onGesture(FINGERPRINT_GESTURE_SWIPE_DOWN);
verify(mMockFingerprintGestureCallback, times(0)).onGestureDetected(FINGERPRINT_GESTURE_SWIPE_DOWN);
messageCapturingHandler.sendLastMessage();
verify(mMockFingerprintGestureCallback, times(1)).onGesture(FINGERPRINT_GESTURE_SWIPE_DOWN);
verify(mMockFingerprintGestureCallback, times(1)).onGestureDetected(FINGERPRINT_GESTURE_SWIPE_DOWN);
reset(mMockFingerprintGestureCallback);
mFingerprintGestureController.unregisterFingerprintGestureCallback(