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

Commit ea73d5e1 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge changes from topic "udfps_keyguard_view_controller_to_kotlin-master" 

* changes:
  1/N sideFPs bouncer, separate altBouncer callback
  Refactor file from java => kotlin
parents a2ceba20 3c0fb42d

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

+7 −2
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import com.android.systemui.dump.DumpManager; 
import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.keyguard.ScreenLifecycle;

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

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.shade.ShadeExpansionStateManager;
@@ -133,6 +134,7 @@ public class UdfpsController implements DozeReceiver { 
    @NonNull private final LatencyTracker mLatencyTracker;

    @VisibleForTesting @NonNull final BiometricDisplayListener mOrientationListener;

    @NonNull private final ActivityLaunchAnimator mActivityLaunchAnimator;

    @NonNull private final BouncerInteractor mBouncerInteractor;



    // Currently the UdfpsController supports a single UDFPS sensor. If devices have multiple

    // sensors, this, in addition to a lot of the code here, will be updated.
@@ -219,7 +221,8 @@ public class UdfpsController implements DozeReceiver { 
                            mUnlockedScreenOffAnimationController,

                            mUdfpsDisplayMode, requestId, reason, callback,

                            (view, event, fromUdfpsView) -> onTouch(requestId, event,

                                    fromUdfpsView), mActivityLaunchAnimator)));

                                    fromUdfpsView), mActivityLaunchAnimator, mFeatureFlags,

                            mBouncerInteractor)));

        }



        @Override
@@ -620,7 +623,8 @@ public class UdfpsController implements DozeReceiver { 
            @NonNull LatencyTracker latencyTracker,

            @NonNull ActivityLaunchAnimator activityLaunchAnimator,

            @NonNull Optional<AlternateUdfpsTouchProvider> alternateTouchProvider,

            @BiometricsBackground Executor biometricsExecutor) {

            @BiometricsBackground Executor biometricsExecutor,

            @NonNull BouncerInteractor bouncerInteractor) {

        mContext = context;

        mExecution = execution;

        mVibrator = vibrator;
@@ -651,6 +655,7 @@ public class UdfpsController implements DozeReceiver { 
        mActivityLaunchAnimator = activityLaunchAnimator;

        mAlternateTouchProvider = alternateTouchProvider.orElse(null);

        mBiometricExecutor = biometricsExecutor;

        mBouncerInteractor = bouncerInteractor;



        mOrientationListener = new BiometricDisplayListener(

                context,

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt

+30 −24
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ import com.android.keyguard.KeyguardUpdateMonitor 
import com.android.systemui.R

import com.android.systemui.animation.ActivityLaunchAnimator

import com.android.systemui.dump.DumpManager

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.keyguard.domain.interactor.BouncerInteractor

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.shade.ShadeExpansionStateManager

import com.android.systemui.statusbar.LockscreenShadeTransitionController
@@ -92,6 +94,8 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
        private val controllerCallback: IUdfpsOverlayControllerCallback,

        private val onTouch: (View, MotionEvent, Boolean) -> Boolean,

        private val activityLaunchAnimator: ActivityLaunchAnimator,

        private val featureFlags: FeatureFlags,

        private val bouncerInteractor: BouncerInteractor,

        private val isDebuggable: Boolean = Build.IS_DEBUGGABLE

) {

    /** The view, when [isShowing], or null. */
@@ -246,7 +250,9 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
                    unlockedScreenOffAnimationController,

                    dialogManager,

                    controller,

                    activityLaunchAnimator

                    activityLaunchAnimator,

                    featureFlags,

                    bouncerInteractor

                )

            }

            REASON_AUTH_BP -> {