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

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

Merge changes from topic "revert-20691780-cherrypick-modernize_alt_bouncer-2av1xvqe7q-EXOZAWOBTI" 

* changes:
  Revert "Modernize alternate bouncer logic"
  Revert "Remove ScrimController from BiometricUnlockController"
parents 6ad0de2e b738eddd

packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ constructor( 
        val dialog = animatedDialog.dialog



        // Don't animate if the dialog is not showing or if we are locked and going to show the

        // primary bouncer.

        // bouncer.

        if (

            !dialog.isShowing ||

                (!callback.isUnlocked() && !callback.isShowingAlternateAuthOnUnlock())

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+0 −7
Original line number Diff line number Diff line
@@ -691,13 +691,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        updateBiometricListeningState(BIOMETRIC_ACTION_STOP, FACE_AUTH_STOPPED_KEYGUARD_GOING_AWAY);

    }



    /**

     * Whether keyguard is going away due to screen off or device entry.

     */

    public boolean isKeyguardGoingAway() {

        return mKeyguardGoingAway;

    }



    /**

     * Updates KeyguardUpdateMonitor's internal state to know if keyguard is showing and if

     * its occluded. The keyguard is considered visible if its showing and NOT occluded.

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

+16 −45
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.biometrics; 


import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE;

import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT;

import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_REAR;



import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_AWAKE;

import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP;
@@ -80,7 +79,6 @@ import com.android.systemui.dagger.qualifiers.Background; 
import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.doze.DozeReceiver;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.keyguard.data.repository.BiometricType;

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

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.VibratorHelper;
@@ -90,10 +88,8 @@ import com.android.systemui.util.concurrency.Execution; 
import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;

import java.util.HashSet;

import java.util.List;

import java.util.Map;

import java.util.Objects;

import java.util.Set;
@@ -162,7 +158,6 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
    @Nullable private List<FingerprintSensorPropertiesInternal> mUdfpsProps;

    @Nullable private List<FingerprintSensorPropertiesInternal> mSidefpsProps;



    @NonNull private final Map<Integer, Boolean> mFpEnrolledForUser = new HashMap<>();

    @NonNull private final SparseBooleanArray mUdfpsEnrolledForUser;

    @NonNull private final SparseBooleanArray mFaceEnrolledForUser;

    @NonNull private final SparseBooleanArray mSfpsEnrolledForUser;
@@ -175,6 +170,7 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
    private final @Background DelayableExecutor mBackgroundExecutor;

    private final DisplayInfo mCachedDisplayInfo = new DisplayInfo();





    private final VibratorHelper mVibratorHelper;



    private void vibrateSuccess(int modality) {
@@ -352,21 +348,12 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
        mExecution.assertIsMainThread();

        Log.d(TAG, "handleEnrollmentsChanged, userId: " + userId + ", sensorId: " + sensorId

                + ", hasEnrollments: " + hasEnrollments);

        BiometricType sensorBiometricType = BiometricType.UNKNOWN;

        if (mFpProps != null) {

            for (FingerprintSensorPropertiesInternal prop: mFpProps) {

        if (mUdfpsProps == null) {

            Log.d(TAG, "handleEnrollmentsChanged, mUdfpsProps is null");

        } else {

            for (FingerprintSensorPropertiesInternal prop : mUdfpsProps) {

                if (prop.sensorId == sensorId) {

                    mFpEnrolledForUser.put(userId, hasEnrollments);

                    if (prop.isAnyUdfpsType()) {

                        sensorBiometricType = BiometricType.UNDER_DISPLAY_FINGERPRINT;

                    mUdfpsEnrolledForUser.put(userId, hasEnrollments);

                    } else if (prop.isAnySidefpsType()) {

                        sensorBiometricType = BiometricType.SIDE_FINGERPRINT;

                        mSfpsEnrolledForUser.put(userId, hasEnrollments);

                    } else if (prop.sensorType == TYPE_REAR) {

                        sensorBiometricType = BiometricType.REAR_FINGERPRINT;

                    }

                    break;

                }

            }

        }
@@ -376,14 +363,20 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
            for (FaceSensorPropertiesInternal prop : mFaceProps) {

                if (prop.sensorId == sensorId) {

                    mFaceEnrolledForUser.put(userId, hasEnrollments);

                    sensorBiometricType = BiometricType.FACE;

                    break;

                }

            }

        }

        if (mSidefpsProps == null) {

            Log.d(TAG, "handleEnrollmentsChanged, mSidefpsProps is null");

        } else {

            for (FingerprintSensorPropertiesInternal prop : mSidefpsProps) {

                if (prop.sensorId == sensorId) {

                    mSfpsEnrolledForUser.put(userId, hasEnrollments);

                }

            }

        }

        for (Callback cb : mCallbacks) {

            cb.onEnrollmentsChanged(modality);

            cb.onEnrollmentsChanged(sensorBiometricType, userId, hasEnrollments);

        }

    }
@@ -636,11 +629,6 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
        }

    }



    /** Get FP sensor properties */

    public @Nullable List<FingerprintSensorPropertiesInternal> getFingerprintProperties() {

        return mFpProps;

    }



    /**

     * @return where the face sensor exists in pixels in the current device orientation. Returns

     * null if no face sensor exists.
@@ -893,7 +881,7 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
    }



    @Override

    public void setBiometricContextListener(IBiometricContextListener listener) {

    public void setBiometicContextListener(IBiometricContextListener listener) {

        mBiometricContextListener = listener;

        notifyDozeChanged(mStatusBarStateController.isDozing(),

                mWakefulnessLifecycle.getWakefulness());
@@ -1152,13 +1140,6 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
        return mCurrentDialog != null;

    }



    /**

     * Whether the passed userId has enrolled at least one fingerprint.

     */

    public boolean isFingerprintEnrolled(int userId) {

        return mFpEnrolledForUser.getOrDefault(userId, false);

    }



    private void showDialog(SomeArgs args, boolean skipAnimation, Bundle savedState) {

        mCurrentDialogArgs = args;
@@ -1341,16 +1322,6 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
         */

        default void onEnrollmentsChanged(@Modality int modality) {}



        /**

         * Called when UDFPS enrollments have changed. This is called after boot and on changes to

         * enrollment.

         */

        default void onEnrollmentsChanged(

                @NonNull BiometricType biometricType,

                int userId,

                boolean hasEnrollments

        ) {}



        /**

         * Called when the biometric prompt starts showing.

         */

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

+5 −0
Original line number Diff line number Diff line
@@ -189,6 +189,11 @@ abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>( 
     */

    open fun listenForTouchesOutsideView(): Boolean = false



    /**

     * Called on touches outside of the view if listenForTouchesOutsideView returns true

     */

    open fun onTouchOutsideView() {}



    /**

     * Called when a view should announce an accessibility event.

     */

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

+11 −10
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ 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.AlternateBouncerInteractor;

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

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -151,7 +150,6 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
    @NonNull private final ActivityLaunchAnimator mActivityLaunchAnimator;

    @NonNull private final PrimaryBouncerInteractor mPrimaryBouncerInteractor;

    @Nullable private final TouchProcessor mTouchProcessor;

    @NonNull private final AlternateBouncerInteractor mAlternateBouncerInteractor;



    // 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.
@@ -239,12 +237,12 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
                            mShadeExpansionStateManager, mKeyguardViewManager,

                            mKeyguardUpdateMonitor, mDialogManager, mDumpManager,

                            mLockscreenShadeTransitionController, mConfigurationController,

                            mKeyguardStateController,

                            mSystemClock, mKeyguardStateController,

                            mUnlockedScreenOffAnimationController,

                            mUdfpsDisplayMode, requestId, reason, callback,

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

                                    fromUdfpsView), mActivityLaunchAnimator, mFeatureFlags,

                            mPrimaryBouncerInteractor, mAlternateBouncerInteractor)));

                            mPrimaryBouncerInteractor)));

        }



        @Override
@@ -363,13 +361,13 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
        if (!mOverlayParams.equals(overlayParams)) {

            mOverlayParams = overlayParams;



            final boolean wasShowingAlternateBouncer = mAlternateBouncerInteractor.isVisibleState();

            final boolean wasShowingAltAuth = mKeyguardViewManager.isShowingAlternateBouncer();



            // When the bounds change it's always necessary to re-create the overlay's window with

            // new LayoutParams. If the overlay needs to be shown, this will re-create and show the

            // overlay with the updated LayoutParams. Otherwise, the overlay will remain hidden.

            redrawOverlay();

            if (wasShowingAlternateBouncer) {

            if (wasShowingAltAuth) {

                mKeyguardViewManager.showBouncer(true);

            }

        }
@@ -577,6 +575,9 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
        final UdfpsView udfpsView = mOverlay.getOverlayView();

        boolean handled = false;

        switch (event.getActionMasked()) {

            case MotionEvent.ACTION_OUTSIDE:

                udfpsView.onTouchOutsideView();

                return true;

            case MotionEvent.ACTION_DOWN:

            case MotionEvent.ACTION_HOVER_ENTER:

                Trace.beginSection("UdfpsController.onTouch.ACTION_DOWN");
@@ -750,8 +751,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
            @NonNull Optional<Provider<AlternateUdfpsTouchProvider>> alternateTouchProvider,

            @NonNull @BiometricsBackground Executor biometricsExecutor,

            @NonNull PrimaryBouncerInteractor primaryBouncerInteractor,

            @NonNull SinglePointerTouchProcessor singlePointerTouchProcessor,

            @NonNull AlternateBouncerInteractor alternateBouncerInteractor) {

            @NonNull SinglePointerTouchProcessor singlePointerTouchProcessor) {

        mContext = context;

        mExecution = execution;

        mVibrator = vibrator;
@@ -791,7 +791,6 @@ public class UdfpsController implements DozeReceiver, Dumpable { 


        mBiometricExecutor = biometricsExecutor;

        mPrimaryBouncerInteractor = primaryBouncerInteractor;

        mAlternateBouncerInteractor = alternateBouncerInteractor;



        mTouchProcessor = mFeatureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)

                ? singlePointerTouchProcessor : null;
@@ -886,7 +885,9 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
                onFingerUp(mOverlay.getRequestId(), oldView);

            }

            final boolean removed = mOverlay.hide();

            if (mKeyguardViewManager.isShowingAlternateBouncer()) {

                mKeyguardViewManager.hideAlternateBouncer(true);

            }

            Log.v(TAG, "hideUdfpsOverlay | removing window: " + removed);

        } else {

            Log.v(TAG, "hideUdfpsOverlay | the overlay is already hidden");