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

Commit c56e7545 authored by Bart Sears's avatar Bart Sears Committed by Automerger Merge Worker
Browse files

Merge "Revert "[Bouncer] Do not send message if face auth..."" into tm-qpr-dev am: e04adb10 

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



Change-Id: I6680685105df977048c17b2eb050249e3dca0e81
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 265d97e9 e04adb10

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

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 


    @Override

    public void reset() {

        super.reset();

        // start fresh

        mDismissing = false;

        mView.resetPasswordText(false /* animate */, false /* announce */);

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

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 


    @Override

    public void reset() {

        mMessageAreaController.setMessage("", false);

    }



    @Override

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt

+8 −0
Original line number Diff line number Diff line
@@ -104,6 +104,14 @@ object KeyguardBouncerViewBinder { 
                        }

                    }



                    launch {

                        viewModel.showWithFullExpansion.collect { model ->

                            hostViewController.resetSecurityContainer()

                            hostViewController.showPromptReason(model.promptReason)

                            hostViewController.onResume()

                        }

                    }



                    launch {

                        viewModel.hide.collect {

                            hostViewController.cancelDismissAction()

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBouncerViewModel.kt

+6 −0
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ import com.android.systemui.keyguard.data.BouncerViewDelegate 
import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor

import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel

import com.android.systemui.keyguard.shared.model.KeyguardBouncerModel

import com.android.systemui.statusbar.phone.KeyguardBouncer.EXPANSION_VISIBLE

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.filter

import kotlinx.coroutines.flow.map



/** Models UI state for the lock screen bouncer; handles user input. */
@@ -42,6 +44,10 @@ constructor( 
    /** Observe whether bouncer is showing. */

    val show: Flow<KeyguardBouncerModel> = interactor.show



    /** Observe visible expansion when bouncer is showing. */

    val showWithFullExpansion: Flow<KeyguardBouncerModel> =

        interactor.show.filter { it.expansionAmount == EXPANSION_VISIBLE }



    /** Observe whether bouncer is hiding. */

    val hide: Flow<Unit> = interactor.hide

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+1 −2
Original line number Diff line number Diff line
@@ -930,8 +930,7 @@ public class KeyguardIndicationController { 
        if (mStatusBarKeyguardViewManager.isBouncerShowing()) {

            if (mStatusBarKeyguardViewManager.isShowingAlternateBouncer()) {

                return; // udfps affordance is highlighted, no need to show action to unlock

            } else if (!mKeyguardUpdateMonitor.getIsFaceAuthenticated()

                    && mKeyguardUpdateMonitor.isFaceEnrolled()) {

            } else if (mKeyguardUpdateMonitor.isFaceEnrolled()) {

                String message = mContext.getString(R.string.keyguard_retry);

                mStatusBarKeyguardViewManager.setKeyguardMessage(message, mInitialTextColorState);

            }