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

Commit cc99de31 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: I7ed05912832f633b1abc7e98c76bba4ac259ff4a
parents 66bf510a e5bce979

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

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




        addView(mFrameLayout);

        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

        // TODO: De-dupe the logic with AuthCredentialPasswordView

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

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

            if (keyCode != KeyEvent.KEYCODE_BACK) {

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

    }





    private void addBiometricView() {

    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);

        mBiometricScrollView.addView(mBiometricView);

    }

    }