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

Commit 5a10a78e authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Reset message area." into tm-qpr-dev am: 796e1c4c 

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



Change-Id: Ia7c25b5b5803e1f1aee3d256548e51946ff883f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a539c66e 796e1c4c

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

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ 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

+0 −7
Original line number Diff line number Diff line
@@ -106,13 +106,6 @@ object KeyguardBouncerViewBinder { 
                            hostViewController.appear(

                                SystemBarUtils.getStatusBarHeight(view.context)

                            )

                        }

                    }



                    launch {

                        viewModel.showWithFullExpansion.collect { model ->

                            hostViewController.resetSecurityContainer()

                            hostViewController.showPromptReason(model.promptReason)

                            hostViewController.onResume()

                        }

                    }

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

+0 −6
Original line number Diff line number Diff line
@@ -20,12 +20,10 @@ import android.view.View 
import com.android.systemui.keyguard.data.BouncerView

import com.android.systemui.keyguard.data.BouncerViewDelegate

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

import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE

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

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

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. */
@@ -44,10 +42,6 @@ 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/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java

+7 −0
Original line number Diff line number Diff line
@@ -150,4 +150,11 @@ public class KeyguardAbsKeyInputViewControllerTest extends SysuiTestCase { 
                getContext().getResources().getString(R.string.kg_prompt_reason_restart_password),

                false);

    }





    @Test

    public void testReset() {

        mKeyguardAbsKeyInputViewController.reset();

        verify(mKeyguardMessageAreaController).setMessage("", false);

    }

}