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

Commit acab93bb authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Initalize view immediatly after construction to ensure all errors are... 

Merge "Initalize view immediatly after construction to ensure all errors are processed." into sc-dev am: e5bce979

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

Change-Id: Ic18e283e806d00ce54af5f2bc7d5cc75cb968376
parents 1920064b e5bce979

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

+11 −7
Original line number Diff line number Diff line
@@ -376,6 +376,17 @@ public class AuthContainerView extends LinearLayout 


        addView(mFrameLayout);



        // init view before showing

        if (mBiometricView != null) {

            mBiometricView.setRequireConfirmation(mConfig.mRequireConfirmation);

            mBiometricView.setPanelController(mPanelController);

            mBiometricView.setPromptInfo(mConfig.mPromptInfo);

            mBiometricView.setCallback(mBiometricCallback);

            mBiometricView.setBackgroundView(mBackgroundView);

            mBiometricView.setUserId(mConfig.mUserId);

            mBiometricView.setEffectiveUserId(mEffectiveUserId);

        }



        // TODO: De-dupe the logic with AuthCredentialPasswordView

        setOnKeyListener((v, keyCode, event) -> {

            if (keyCode != KeyEvent.KEYCODE_BACK) {
@@ -404,13 +415,6 @@ public class AuthContainerView extends LinearLayout 
    }



    private void addBiometricView() {

        mBiometricView.setRequireConfirmation(mConfig.mRequireConfirmation);

        mBiometricView.setPanelController(mPanelController);

        mBiometricView.setPromptInfo(mConfig.mPromptInfo);

        mBiometricView.setCallback(mBiometricCallback);

        mBiometricView.setBackgroundView(mBackgroundView);

        mBiometricView.setUserId(mConfig.mUserId);

        mBiometricView.setEffectiveUserId(mEffectiveUserId);

        mBiometricScrollView.addView(mBiometricView);

    }