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

Commit 9c6110ae authored by Matt Pietal's avatar Matt Pietal
Browse files

Fix swipe up to unlock, then swipe down 

This results in a transition to GONE, but if the user
swipes back down it can be reversed back to LOCKSCREEN.
The KeyguardWmStateRefactor fixes this whole path, so
this should be a very temporary patch until that code
is active.

Fixes: 328590903
Test: manual - swipe up to unlock, but then back
Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint
TEAMFOOD

Change-Id: I3522a10221576b6c466fd0e3eb402798c103fa06
parent e4fdb75f

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ class KeyguardInteractorTest : SysuiTestCase() { 
    private val testScope = kosmos.testScope

    private val repository by lazy { kosmos.fakeKeyguardRepository }

    private val sceneInteractor by lazy { kosmos.sceneInteractor }

    private val fromGoneTransitionInteractor by lazy { kosmos.fromGoneTransitionInteractor }

    private val commandQueue by lazy { FakeCommandQueue() }

    private val bouncerRepository = FakeKeyguardBouncerRepository()

    private val shadeRepository = FakeShadeRepository()
@@ -79,6 +80,7 @@ class KeyguardInteractorTest : SysuiTestCase() { 
            shadeRepository = shadeRepository,

            keyguardTransitionInteractor = kosmos.keyguardTransitionInteractor,

            sceneInteractorProvider = { sceneInteractor },

            fromGoneTransitionInteractor = { fromGoneTransitionInteractor },

        )

    }

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STR 
import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN;

import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_FOR_UNATTENDED_UPDATE;

import static com.android.systemui.DejankUtils.whitelistIpcs;

import static com.android.systemui.Flags.migrateClocksToBlueprint;

import static com.android.systemui.Flags.notifyPowerManagerUserActivityBackground;

import static com.android.systemui.Flags.refactorGetCurrentUser;

import static com.android.systemui.keyguard.ui.viewmodel.LockscreenToDreamingTransitionViewModel.DREAMING_ANIMATION_DURATION_MS;
@@ -3401,6 +3402,11 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
                mSurfaceBehindRemoteAnimationFinishedCallback = null;

            }

        }



        // Ensure that keyguard becomes visible if the going away animation is canceled

        if (showKeyguard && !KeyguardWmStateRefactor.isEnabled() && migrateClocksToBlueprint()) {

            mKeyguardInteractor.showKeyguard();

        }

    }



    private void adjustStatusBarLocked() {

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ constructor( 
        listenForGoneToDreamingLockscreenHosted()

    }



    fun showKeyguard() {

        scope.launch { startTransitionTo(KeyguardState.LOCKSCREEN) }

    }



    // Primarily for when the user chooses to lock down the device

    private fun listenForGoneToLockscreenOrHub() {

        if (KeyguardWmStateRefactor.isEnabled) {

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ constructor( 
    shadeRepository: ShadeRepository,

    keyguardTransitionInteractor: KeyguardTransitionInteractor,

    sceneInteractorProvider: Provider<SceneInteractor>,

    private val fromGoneTransitionInteractor: Provider<FromGoneTransitionInteractor>,

) {

    // TODO(b/296118689): move to a repository

    private val _sharedNotificationContainerBounds = MutableStateFlow(NotificationContainerBounds())
@@ -383,6 +384,11 @@ constructor( 
        repository.topClippingBounds.value = top

    }



    /** Temporary shim, until [KeyguardWmStateRefactor] is enabled */

    fun showKeyguard() {

        fromGoneTransitionInteractor.get().showKeyguard()

    }



    companion object {

        private const val TAG = "KeyguardInteractor"

    }

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java

+2 −1
Original line number Diff line number Diff line
@@ -196,7 +196,8 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { 
                new ConfigurationInteractor(configurationRepository),

                shadeRepository,

                keyguardTransitionInteractor,

                () -> sceneInteractor);

                () -> sceneInteractor,

                () -> mKosmos.getFromGoneTransitionInteractor());

        CommunalInteractor communalInteractor = mKosmos.getCommunalInteractor();



        mFromLockscreenTransitionInteractor = mKosmos.getFromLockscreenTransitionInteractor();