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

Commit d7e1fb89 authored by Phil Weaver's avatar Phil Weaver
Browse files

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
parent dc088a64

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -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);















  }







































api/system-current.txt



+2
−1




























Original line number
Diff line number
Diff line








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















  }







































api/test-current.txt



+2
−1




























Original line number
Diff line number
Diff line








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















  }







































core/java/android/accessibilityservice/FingerprintGestureController.java



+8
−2




























Original line number
Diff line number
Diff line








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















    }















}
























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



+3
−3




























Original line number
Diff line number
Diff line








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