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

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

Merge "Fix touches passing though Notification Bar drag down" into udc-dev am: e9d162e9 

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



Change-Id: Iee86c9dc770e1cfbe994625236fdeebff948a960
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 684b6a76 e9d162e9

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

+6 −3
Original line number Diff line number Diff line
@@ -553,6 +553,10 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
                    + mOverlay.getRequestId());

            return false;

        }

        if (mLockscreenShadeTransitionController.getQSDragProgress() != 0f

                || mPrimaryBouncerInteractor.isInTransit()) {

            return false;

        }



        final TouchProcessorResult result = mTouchProcessor.processTouch(event, mActivePointerId,

                mOverlayParams);
@@ -626,9 +630,8 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
            shouldPilfer = true;

        }



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

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

                && !mPrimaryBouncerInteractor.isInTransit()) {

        // Execute the pilfer

        if (shouldPilfer) {

            mInputManager.pilferPointers(

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

        }

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

+5 −3
Original line number Diff line number Diff line
@@ -1388,7 +1388,7 @@ public class UdfpsControllerTest extends SysuiTestCase { 
    }



    @Test

    public void onTouch_withNewTouchDetection_doNotPilferWhenPullingUpBouncer()

    public void onTouch_withNewTouchDetection_doNotProcessTouchWhenPullingUpBouncer()

            throws RemoteException {

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

                0L);
@@ -1427,8 +1427,10 @@ public class UdfpsControllerTest extends SysuiTestCase { 
        mBiometricExecutor.runAllReady();

        moveEvent.recycle();



        // THEN the touch is NOT pilfered

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

        // THEN the touch is NOT processed

        verify(mFingerprintManager, never()).onPointerDown(anyLong(), anyInt(), anyInt(),

                anyFloat(), anyFloat(), anyFloat(), anyFloat(), anyFloat(), anyLong(), anyLong(),

                anyBoolean());

    }



    @Test