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

Commit 15e712c2 authored by Austin Delgado's avatar Austin Delgado Committed by Automerger Merge Worker
Browse files

Merge "Add check for swipes before pilfering touch" into udc-dev am: 43b792ce am: b59e6f1d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22495787



Change-Id: Ifc440df0c8289f0b2f96965f751a8e6c6fbda784
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34c6451d b59e6f1d

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+8 −2
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
                (TouchProcessorResult.ProcessedTouch) result;

        final NormalizedTouchData data = processedTouch.getTouchData();



        boolean shouldPilfer = false;

        mActivePointerId = processedTouch.getPointerOnSensorId();

        switch (processedTouch.getEvent()) {

            case DOWN:
@@ -581,8 +582,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
                        mStatusBarStateController.isDozing());



                // Pilfer if valid overlap, don't allow following events to reach keyguard

                mInputManager.pilferPointers(

                        mOverlay.getOverlayView().getViewRootImpl().getInputToken());

                shouldPilfer = true;

                break;



            case UP:
@@ -621,6 +621,12 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
        // Always pilfer pointers that are within sensor area or when alternate bouncer is showing

        if (isWithinSensorArea(mOverlay.getOverlayView(), event.getRawX(), event.getRawY(), true)

                || mAlternateBouncerInteractor.isVisibleState()) {

            shouldPilfer = true;

        }



        // Execute the pilfer, never pilfer if a vertical swipe is in progress

        if (shouldPilfer && mLockscreenShadeTransitionController.getQSDragProgress() == 0f

                && !mPrimaryBouncerInteractor.isInTransit()) {

            mInputManager.pilferPointers(

                    mOverlay.getOverlayView().getViewRootImpl().getInputToken());

        }

packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java

+49 −5
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ public class UdfpsControllerTest extends SysuiTestCase { 
            // THEN the display should be unconfigured once. If the timeout action is not

            // cancelled, the display would be unconfigured twice which would cause two

            // FP attempts.

            verify(mUdfpsView, times(1)).unconfigureDisplay();

            verify(mUdfpsView).unconfigureDisplay();

        } else {

            verify(mUdfpsView, never()).unconfigureDisplay();

        }
@@ -1301,8 +1301,8 @@ public class UdfpsControllerTest extends SysuiTestCase { 
        mBiometricExecutor.runAllReady();

        downEvent.recycle();



        // THEN the touch is pilfered, expected twice (valid overlap and touch on sensor)

        verify(mInputManager, times(2)).pilferPointers(any());

        // THEN the touch is pilfered

        verify(mInputManager).pilferPointers(any());

    }



    @Test
@@ -1340,7 +1340,7 @@ public class UdfpsControllerTest extends SysuiTestCase { 
        downEvent.recycle();



        // THEN the touch is NOT pilfered

        verify(mInputManager, times(0)).pilferPointers(any());

        verify(mInputManager, never()).pilferPointers(any());

    }



    @Test
@@ -1380,7 +1380,51 @@ public class UdfpsControllerTest extends SysuiTestCase { 
        downEvent.recycle();



        // THEN the touch is pilfered

        verify(mInputManager, times(1)).pilferPointers(any());

        verify(mInputManager).pilferPointers(any());

    }



    @Test

    public void onTouch_withNewTouchDetection_doNotPilferWhenPullingUpBouncer()

            throws RemoteException {

        final NormalizedTouchData touchData = new NormalizedTouchData(0, 0f, 0f, 0f, 0f, 0f, 0L,

                0L);

        final TouchProcessorResult processorResultMove =

                new TouchProcessorResult.ProcessedTouch(InteractionEvent.DOWN,

                        1 /* pointerId */, touchData);



        // Enable new touch detection.

        when(mFeatureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)).thenReturn(true);



        // Configure UdfpsController to use FingerprintManager as opposed to AlternateTouchProvider.

        initUdfpsController(mOpticalProps, false /* hasAlternateTouchProvider */);



        // Configure UdfpsView to accept the ACTION_MOVE event

        when(mUdfpsView.isDisplayConfigured()).thenReturn(false);

        when(mUdfpsView.isWithinSensorArea(anyFloat(), anyFloat())).thenReturn(true);



        // GIVEN that the alternate bouncer is not showing and a11y touch exploration NOT enabled

        when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(false);

        when(mAlternateBouncerInteractor.isVisibleState()).thenReturn(false);

        mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, mOpticalProps.sensorId,

                BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback);

        mFgExecutor.runAllReady();



        verify(mUdfpsView).setOnTouchListener(mTouchListenerCaptor.capture());



        // GIVEN a swipe up to bring up primary bouncer is in progress or swipe down for QS

        when(mPrimaryBouncerInteractor.isInTransit()).thenReturn(true);

        when(mLockscreenShadeTransitionController.getFractionToShade()).thenReturn(1f);



        // WHEN ACTION_MOVE is received and touch is within sensor

        when(mSinglePointerTouchProcessor.processTouch(any(), anyInt(), any())).thenReturn(

                processorResultMove);

        MotionEvent moveEvent = MotionEvent.obtain(0, 0, ACTION_MOVE, 0, 0, 0);

        mTouchListenerCaptor.getValue().onTouch(mUdfpsView, moveEvent);

        mBiometricExecutor.runAllReady();

        moveEvent.recycle();



        // THEN the touch is NOT pilfered

        verify(mInputManager, never()).pilferPointers(any());

    }



    @Test