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

Commit 58e35d71 authored by Grace Cheng's avatar Grace Cheng Committed by Android (Google) Code Review
Browse files

Merge "Fix missing BP icon" into main

parents 1baad2d8 affa8137

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

+3 −18
Original line number Diff line number Diff line
@@ -73,9 +73,7 @@ import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteracto 
import com.android.systemui.biometrics.domain.model.BiometricModalities;

import com.android.systemui.biometrics.ui.BiometricPromptLayout;

import com.android.systemui.biometrics.ui.CredentialView;

import com.android.systemui.biometrics.ui.binder.AuthBiometricFingerprintViewBinder;

import com.android.systemui.biometrics.ui.binder.BiometricViewBinder;

import com.android.systemui.biometrics.ui.viewmodel.AuthBiometricFingerprintViewModel;

import com.android.systemui.biometrics.ui.viewmodel.CredentialViewModel;

import com.android.systemui.biometrics.ui.viewmodel.PromptViewModel;

import com.android.systemui.dagger.qualifiers.Background;
@@ -142,8 +140,6 @@ public class AuthContainerView extends LinearLayout 


    // TODO: these should be migrated out once ready

    private final Provider<PromptCredentialInteractor> mPromptCredentialInteractor;

    private final Provider<AuthBiometricFingerprintViewModel>

            mAuthBiometricFingerprintViewModelProvider;

    private final @NonNull Provider<PromptSelectorInteractor> mPromptSelectorInteractorProvider;

    // TODO(b/251476085): these should be migrated out of the view

    private final Provider<CredentialViewModel> mCredentialViewModelProvider;
@@ -283,8 +279,6 @@ public class AuthContainerView extends LinearLayout 
            @NonNull UserManager userManager,

            @NonNull LockPatternUtils lockPatternUtils,

            @NonNull InteractionJankMonitor jankMonitor,

            @NonNull Provider<AuthBiometricFingerprintViewModel>

                    authBiometricFingerprintViewModelProvider,

            @NonNull Provider<PromptCredentialInteractor> promptCredentialInteractor,

            @NonNull Provider<PromptSelectorInteractor> promptSelectorInteractor,

            @NonNull PromptViewModel promptViewModel,
@@ -293,9 +287,9 @@ public class AuthContainerView extends LinearLayout 
            @NonNull VibratorHelper vibratorHelper) {

        this(config, featureFlags, applicationCoroutineScope, fpProps, faceProps,

                wakefulnessLifecycle, panelInteractionDetector, userManager, lockPatternUtils,

                jankMonitor, authBiometricFingerprintViewModelProvider, promptSelectorInteractor,

                promptCredentialInteractor, promptViewModel, credentialViewModelProvider,

                new Handler(Looper.getMainLooper()), bgExecutor, vibratorHelper);

                jankMonitor, promptSelectorInteractor, promptCredentialInteractor, promptViewModel,

                credentialViewModelProvider, new Handler(Looper.getMainLooper()), bgExecutor,

                vibratorHelper);

    }



    @VisibleForTesting
@@ -309,8 +303,6 @@ public class AuthContainerView extends LinearLayout 
            @NonNull UserManager userManager,

            @NonNull LockPatternUtils lockPatternUtils,

            @NonNull InteractionJankMonitor jankMonitor,

            @NonNull Provider<AuthBiometricFingerprintViewModel>

                    authBiometricFingerprintViewModelProvider,

            @NonNull Provider<PromptSelectorInteractor> promptSelectorInteractorProvider,

            @NonNull Provider<PromptCredentialInteractor> credentialInteractor,

            @NonNull PromptViewModel promptViewModel,
@@ -359,7 +351,6 @@ public class AuthContainerView extends LinearLayout 
        mBackgroundExecutor = bgExecutor;

        mInteractionJankMonitor = jankMonitor;

        mPromptCredentialInteractor = credentialInteractor;

        mAuthBiometricFingerprintViewModelProvider = authBiometricFingerprintViewModelProvider;

        mPromptSelectorInteractorProvider = promptSelectorInteractorProvider;

        mCredentialViewModelProvider = credentialViewModelProvider;

        mPromptViewModel = promptViewModel;
@@ -442,9 +433,6 @@ public class AuthContainerView extends LinearLayout 
                fingerprintAndFaceView.updateOverrideIconLayoutParamsSize();

                fingerprintAndFaceView.setFaceClass3(

                        faceProperties.sensorStrength == STRENGTH_STRONG);

                final AuthBiometricFingerprintViewModel fpAndFaceViewModel =

                        mAuthBiometricFingerprintViewModelProvider.get();

                AuthBiometricFingerprintViewBinder.bind(fingerprintAndFaceView, fpAndFaceViewModel);

                mBiometricView = fingerprintAndFaceView;

            } else if (fpProperties != null) {

                final AuthBiometricFingerprintView fpView =
@@ -453,9 +441,6 @@ public class AuthContainerView extends LinearLayout 
                fpView.setSensorProperties(fpProperties);

                fpView.setScaleFactorProvider(config.mScaleProvider);

                fpView.updateOverrideIconLayoutParamsSize();

                final AuthBiometricFingerprintViewModel fpViewModel =

                        mAuthBiometricFingerprintViewModelProvider.get();

                AuthBiometricFingerprintViewBinder.bind(fpView, fpViewModel);

                mBiometricView = fpView;

            } else if (faceProperties != null) {

                mBiometricView = (AuthBiometricFaceView) layoutInflater.inflate(

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

+2 −9
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ import com.android.systemui.CoreStartable; 
import com.android.systemui.biometrics.domain.interactor.LogContextInteractor;

import com.android.systemui.biometrics.domain.interactor.PromptCredentialInteractor;

import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteractor;

import com.android.systemui.biometrics.ui.viewmodel.AuthBiometricFingerprintViewModel;

import com.android.systemui.biometrics.ui.viewmodel.CredentialViewModel;

import com.android.systemui.biometrics.ui.viewmodel.PromptViewModel;

import com.android.systemui.dagger.SysUISingleton;
@@ -134,8 +133,6 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
    private final CoroutineScope mApplicationCoroutineScope;



    // TODO: these should be migrated out once ready

    @NonNull private final Provider<AuthBiometricFingerprintViewModel>

            mAuthBiometricFingerprintViewModelProvider;

    @NonNull private final Provider<PromptCredentialInteractor> mPromptCredentialInteractor;

    @NonNull private final Provider<PromptSelectorInteractor> mPromptSelectorInteractor;

    @NonNull private final Provider<CredentialViewModel> mCredentialViewModelProvider;
@@ -765,8 +762,6 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
            @NonNull LockPatternUtils lockPatternUtils,

            @NonNull UdfpsLogger udfpsLogger,

            @NonNull LogContextInteractor logContextInteractor,

            @NonNull Provider<AuthBiometricFingerprintViewModel>

                    authBiometricFingerprintViewModelProvider,

            @NonNull Provider<PromptCredentialInteractor> promptCredentialInteractorProvider,

            @NonNull Provider<PromptSelectorInteractor> promptSelectorInteractorProvider,

            @NonNull Provider<CredentialViewModel> credentialViewModelProvider,
@@ -801,7 +796,6 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
        mVibratorHelper = vibratorHelper;



        mLogContextInteractor = logContextInteractor;

        mAuthBiometricFingerprintViewModelProvider = authBiometricFingerprintViewModelProvider;

        mPromptSelectorInteractor = promptSelectorInteractorProvider;

        mPromptCredentialInteractor = promptCredentialInteractorProvider;

        mPromptViewModelProvider = promptViewModelProvider;
@@ -1344,9 +1338,8 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
        config.mScaleProvider = this::getScaleFactor;

        return new AuthContainerView(config, mFeatureFlags, mApplicationCoroutineScope, mFpProps, mFaceProps,

                wakefulnessLifecycle, panelInteractionDetector, userManager, lockPatternUtils,

                mInteractionJankMonitor, mAuthBiometricFingerprintViewModelProvider,

                mPromptCredentialInteractor, mPromptSelectorInteractor, viewModel,

                mCredentialViewModelProvider, bgExecutor, mVibratorHelper);

                mInteractionJankMonitor, mPromptCredentialInteractor, mPromptSelectorInteractor,

                viewModel, mCredentialViewModelProvider, bgExecutor, mVibratorHelper);

    }



    @Override

packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractor.kt

+10 −0
Original line number Diff line number Diff line
@@ -21,15 +21,18 @@ import com.android.internal.widget.LockPatternUtils 
import com.android.systemui.biometrics.Utils

import com.android.systemui.biometrics.Utils.getCredentialType

import com.android.systemui.biometrics.Utils.isDeviceCredentialAllowed

import com.android.systemui.biometrics.data.repository.FingerprintPropertyRepository

import com.android.systemui.biometrics.data.repository.PromptRepository

import com.android.systemui.biometrics.domain.model.BiometricModalities

import com.android.systemui.biometrics.domain.model.BiometricOperationInfo

import com.android.systemui.biometrics.domain.model.BiometricPromptRequest

import com.android.systemui.biometrics.shared.model.BiometricUserInfo

import com.android.systemui.biometrics.shared.model.FingerprintSensorType

import com.android.systemui.biometrics.shared.model.PromptKind

import com.android.systemui.dagger.SysUISingleton

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.combine

import kotlinx.coroutines.flow.distinctUntilChanged

import kotlinx.coroutines.flow.map
@@ -65,6 +68,9 @@ interface PromptSelectorInteractor { 
     */

    val isConfirmationRequired: Flow<Boolean>



    /** Fingerprint sensor type */

    val sensorType: StateFlow<FingerprintSensorType>



    /** Use biometrics for authentication. */

    fun useBiometricsForAuthentication(

        promptInfo: PromptInfo,
@@ -89,6 +95,7 @@ interface PromptSelectorInteractor { 
class PromptSelectorInteractorImpl

@Inject

constructor(

    private val fingerprintPropertyRepository: FingerprintPropertyRepository,

    private val promptRepository: PromptRepository,

    lockPatternUtils: LockPatternUtils,

) : PromptSelectorInteractor {
@@ -140,6 +147,9 @@ constructor( 
            }

        }



    override val sensorType: StateFlow<FingerprintSensorType> =

        fingerprintPropertyRepository.sensorType



    override fun useBiometricsForAuthentication(

        promptInfo: PromptInfo,

        userId: Int,

packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/AuthBiometricFingerprintViewBinder.kt

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 */



package com.android.systemui.biometrics.ui.binder



import com.android.systemui.biometrics.AuthBiometricFingerprintView

import com.android.systemui.biometrics.ui.viewmodel.AuthBiometricFingerprintViewModel



object AuthBiometricFingerprintViewBinder {



    /**

     * Binds a [AuthBiometricFingerprintView.mIconView] to a [AuthBiometricFingerprintViewModel].

     */

    @JvmStatic

    fun bind(view: AuthBiometricFingerprintView, viewModel: AuthBiometricFingerprintViewModel) {

        if (view.isSfps) {

            AuthBiometricFingerprintIconViewBinder.bind(view.getIconView(), viewModel)

        }

    }

}

packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ object BiometricViewBinder { 


        val iconViewOverlay = view.requireViewById<LottieAnimationView>(R.id.biometric_icon_overlay)

        val iconView = view.requireViewById<LottieAnimationView>(R.id.biometric_icon)



        PromptFingerprintIconViewBinder.bind(iconView, viewModel.fingerprintIconViewModel)



        val indicatorMessageView = view.requireViewById<TextView>(R.id.indicator)



        // Negative-side (left) buttons