From d7e1fb89d961636bcb98777efbb39c987fad2b7d Mon Sep 17 00:00:00 2001 From: Phil Weaver Date: Wed, 26 Apr 2017 15:20:24 -0700 Subject: [PATCH] Rename FingerprintGestureCallback.onGesture Renaming to onGestureDetected. Deprecating onGesture. It needs to be removed for release. Leaving it in to avoid breaking TalkBack, which is using it. Bug: 37708057 Test: Accessibility unit and CTS tests still pass. Change-Id: Icd66889216fc978ad6d27aa83a8c8d13869daad3 --- api/current.txt | 3 ++- api/system-current.txt | 3 ++- api/test-current.txt | 3 ++- .../FingerprintGestureController.java | 10 ++++++++-- .../FingerprintGestureControllerTest.java | 6 +++--- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/api/current.txt b/api/current.txt index 22e595b5993fc..6518779bec843 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2878,7 +2878,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); } diff --git a/api/system-current.txt b/api/system-current.txt index 0e303f7447c14..769490b0c1752 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3006,7 +3006,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); } diff --git a/api/test-current.txt b/api/test-current.txt index 9a744cb54b88a..78252d1ae10f8 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2878,7 +2878,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); } diff --git a/core/java/android/accessibilityservice/FingerprintGestureController.java b/core/java/android/accessibilityservice/FingerprintGestureController.java index e203c6de8fb52..db00fffc3a281 100644 --- a/core/java/android/accessibilityservice/FingerprintGestureController.java +++ b/core/java/android/accessibilityservice/FingerprintGestureController.java @@ -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) {} } } diff --git a/services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureControllerTest.java index cf477f2b32eff..f8dfee40698fd 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureControllerTest.java @@ -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(