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

Commit 329c950d authored by burakov's avatar burakov Committed by Danny Burakov
Browse files

[flexiglass] Rename `BouncerInteractor.hide` to `onImeHidden`. 

This better reflects that the view model is notifying the interactor of
a UI event, and the interactor in turn makes a navigational decision.
For more context, see the discussion in ag/24817356.

Bug: 299343836
Test: Unit tests still pass.
Change-Id: If1f1622faef0ad614a7817d3f4315c84eeacd9c0
parent ff72687b

packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt

+4 −5
Original line number Diff line number Diff line
@@ -235,17 +235,16 @@ constructor( 
        repository.setMessage(errorMessage(authenticationInteractor.getAuthenticationMethod()))

    }



    /** If the bouncer is showing, hides the bouncer and return to the lockscreen scene. */

    fun hide(

        loggingReason: String,

    ) {

    /** Notifies the interactor that the input method editor has been hidden. */

    fun onImeHidden() {

        // If the bouncer is showing, hide it and return to the lockscreen scene.

        if (sceneInteractor.desiredScene.value.key != SceneKey.Bouncer) {

            return

        }



        sceneInteractor.changeScene(

            scene = SceneModel(SceneKey.Lockscreen),

            loggingReason = loggingReason,

            loggingReason = "IME hidden",

        )

    }

packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModel.kt

+1 −4
Original line number Diff line number Diff line
@@ -78,10 +78,7 @@ sealed class AuthMethodBouncerViewModel( 
     */

    fun onImeVisibilityChanged(isVisible: Boolean) {

        if (isImeVisible && !isVisible) {

            // The IME has gone from visible to invisible, dismiss the bouncer.

            interactor.hide(

                loggingReason = "IME hidden",

            )

            interactor.onImeHidden()

        }



        isImeVisible = isVisible

packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ class BouncerInteractorTest : SysuiTestCase() { 
            val bouncerSceneKey = currentScene?.key

            assertThat(bouncerSceneKey).isEqualTo(SceneKey.Bouncer)



            underTest.hide("")

            underTest.onImeHidden()



            assertThat(currentScene?.key).isEqualTo(SceneKey.Lockscreen)

        }
@@ -409,7 +409,7 @@ class BouncerInteractorTest : SysuiTestCase() { 
            val notBouncerSceneKey = currentScene?.key

            assertThat(notBouncerSceneKey).isNotEqualTo(SceneKey.Bouncer)



            underTest.hide("")

            underTest.onImeHidden()



            assertThat(currentScene?.key).isEqualTo(notBouncerSceneKey)

        }