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

Commit aa13c0f2 authored by Chandru S's avatar Chandru S Committed by Automerger Merge Worker
Browse files

Merge "Wire up KeyguardFaceAuthInteractor to trigger face auth from... 

Merge "Wire up KeyguardFaceAuthInteractor to trigger face auth from NotificationPanelViewController" into udc-dev am: fba0c333

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



Change-Id: Ieff14c3cb5eca56fb6ee84381a4947837f395f16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 800d7c70 fba0c333

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -129,6 +129,7 @@ import com.android.systemui.fragments.FragmentService; 
import com.android.systemui.keyguard.KeyguardUnlockAnimationController;

import com.android.systemui.keyguard.KeyguardUnlockAnimationController;

import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor;

import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardBottomAreaInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardBottomAreaInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;

import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants;

import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants;
@@ -330,6 +331,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
    private final PulseExpansionHandler mPulseExpansionHandler;

    private final PulseExpansionHandler mPulseExpansionHandler;

    private final KeyguardBypassController mKeyguardBypassController;

    private final KeyguardBypassController mKeyguardBypassController;

    private final KeyguardUpdateMonitor mUpdateMonitor;

    private final KeyguardUpdateMonitor mUpdateMonitor;

    private final KeyguardFaceAuthInteractor mKeyguardFaceAuthInteractor;

    private final ConversationNotificationManager mConversationNotificationManager;

    private final ConversationNotificationManager mConversationNotificationManager;

    private final AuthController mAuthController;

    private final AuthController mAuthController;

    private final MediaHierarchyManager mMediaHierarchyManager;

    private final MediaHierarchyManager mMediaHierarchyManager;
@@ -747,7 +749,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
            DumpManager dumpManager,

            DumpManager dumpManager,

            KeyguardLongPressViewModel keyguardLongPressViewModel,

            KeyguardLongPressViewModel keyguardLongPressViewModel,

            KeyguardInteractor keyguardInteractor,

            KeyguardInteractor keyguardInteractor,

            ActivityStarter activityStarter) {

            ActivityStarter activityStarter,

            KeyguardFaceAuthInteractor keyguardFaceAuthInteractor) {

        mInteractionJankMonitor = interactionJankMonitor;

        mInteractionJankMonitor = interactionJankMonitor;

        keyguardStateController.addCallback(new KeyguardStateController.Callback() {

        keyguardStateController.addCallback(new KeyguardStateController.Callback() {

            @Override

            @Override
@@ -891,6 +894,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        mScreenOffAnimationController = screenOffAnimationController;

        mScreenOffAnimationController = screenOffAnimationController;

        mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;

        mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;

        mLastDownEvents = new NPVCDownEventState.Buffer(MAX_DOWN_EVENT_BUFFER_SIZE);

        mLastDownEvents = new NPVCDownEventState.Buffer(MAX_DOWN_EVENT_BUFFER_SIZE);

        mKeyguardFaceAuthInteractor = keyguardFaceAuthInteractor;





        int currentMode = navigationModeController.addListener(

        int currentMode = navigationModeController.addListener(

                mode -> mIsGestureNavigation = QuickStepContract.isGesturalMode(mode));

                mode -> mIsGestureNavigation = QuickStepContract.isGesturalMode(mode));
@@ -2764,6 +2768,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                    mShadeLog.v("onMiddleClicked on Keyguard, mDozingOnDown: false");

                    mShadeLog.v("onMiddleClicked on Keyguard, mDozingOnDown: false");

                    // Try triggering face auth, this "might" run. Check

                    // Try triggering face auth, this "might" run. Check

                    // KeyguardUpdateMonitor#shouldListenForFace to see when face auth won't run.

                    // KeyguardUpdateMonitor#shouldListenForFace to see when face auth won't run.

                    mKeyguardFaceAuthInteractor.onNotificationPanelClicked();

                    boolean didFaceAuthRun = mUpdateMonitor.requestFaceAuth(

                    boolean didFaceAuthRun = mUpdateMonitor.requestFaceAuth(

                            FaceAuthApiRequestReason.NOTIFICATION_PANEL_CLICKED);

                            FaceAuthApiRequestReason.NOTIFICATION_PANEL_CLICKED);

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -303,6 +303,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
    protected ArgumentCaptor<NotificationStackScrollLayout.OnEmptySpaceClickListener>

    protected ArgumentCaptor<NotificationStackScrollLayout.OnEmptySpaceClickListener>

            mEmptySpaceClickListenerCaptor;

            mEmptySpaceClickListenerCaptor;

    @Mock protected ActivityStarter mActivityStarter;

    @Mock protected ActivityStarter mActivityStarter;

    @Mock protected KeyguardFaceAuthInteractor mKeyguardFaceAuthInteractor;





    protected KeyguardBottomAreaInteractor mKeyguardBottomAreaInteractor;

    protected KeyguardBottomAreaInteractor mKeyguardBottomAreaInteractor;

    protected KeyguardInteractor mKeyguardInteractor;

    protected KeyguardInteractor mKeyguardInteractor;
@@ -600,7 +601,8 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
                mDumpManager,

                mDumpManager,

                mKeyuardLongPressViewModel,

                mKeyuardLongPressViewModel,

                mKeyguardInteractor,

                mKeyguardInteractor,

                mActivityStarter);

                mActivityStarter,

                mKeyguardFaceAuthInteractor);

        mNotificationPanelViewController.initDependencies(

        mNotificationPanelViewController.initDependencies(

                mCentralSurfaces,

                mCentralSurfaces,

                null,

                null,
@@ -667,7 +669,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
                mFeatureFlags,

                mFeatureFlags,

                mInteractionJankMonitor,

                mInteractionJankMonitor,

                mShadeLog,

                mShadeLog,

                mock(KeyguardFaceAuthInteractor.class)

                mKeyguardFaceAuthInteractor

        );

        );

    }

    }

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -930,6 +930,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo 
        mTouchHandler.onTouch(mock(View.class), mDownMotionEvent);

        mTouchHandler.onTouch(mock(View.class), mDownMotionEvent);

        mEmptySpaceClickListenerCaptor.getValue().onEmptySpaceClicked(0, 0);

        mEmptySpaceClickListenerCaptor.getValue().onEmptySpaceClicked(0, 0);





        verify(mKeyguardFaceAuthInteractor).onNotificationPanelClicked();

        verify(mUpdateMonitor).requestFaceAuth(

        verify(mUpdateMonitor).requestFaceAuth(

                FaceAuthApiRequestReason.NOTIFICATION_PANEL_CLICKED);

                FaceAuthApiRequestReason.NOTIFICATION_PANEL_CLICKED);

    }

    }