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

Commit 6a2a01f0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I7b7d8da1,Ief3f9879 into main 

* changes:
  Refactor startDismissKeyguard into KeyguardDismissTransitionInteractor
  [Flexiglass] Fix KeyguardWakeDirectlyToGoneInteractor
parents cb4e3050 ba5b1994

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.systemui.flags.Flags 
import com.android.systemui.keyboard.data.repository.FakeKeyboardRepository

import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository

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

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

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

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

import com.android.systemui.kosmos.Kosmos
@@ -279,7 +280,7 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { 
                deviceProvisionedController,

                faceAuthAccessibilityDelegate,

                devicePolicyManager,

                keyguardTransitionInteractor,

                kosmos.keyguardDismissTransitionInteractor,

                { primaryBouncerInteractor },

            ) {

                deviceEntryInteractor

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

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ class FromAlternateBouncerTransitionInteractorTest : SysuiTestCase() { 
            reset(transitionRepository)



            // Authentication results in calling startDismissKeyguardTransition.

            kosmos.keyguardTransitionInteractor.startDismissKeyguardTransition()

            kosmos.keyguardDismissTransitionInteractor.startDismissKeyguardTransition()

            runCurrent()



            assertThat(transitionRepository)

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

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ class FromAodTransitionInteractorTest : SysuiTestCase() { 
        testScope.runTest {

            kosmos.fakeKeyguardRepository.setKeyguardShowing(false)

            kosmos.fakeKeyguardRepository.setKeyguardDismissible(true)

            kosmos.keyguardTransitionInteractor.startDismissKeyguardTransition()

            kosmos.keyguardDismissTransitionInteractor.startDismissKeyguardTransition()

            powerInteractor.setAwakeForTest()

            advanceTimeBy(100) // account for debouncing

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

+5 −5
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInt 
import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.keyguard.KeyguardWmStateRefactor;

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardDismissTransitionInteractor;

import com.android.systemui.log.SessionTracker;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.FalsingManager;
@@ -134,7 +134,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
    private final DeviceEntryFaceAuthInteractor mDeviceEntryFaceAuthInteractor;

    private final BouncerMessageInteractor mBouncerMessageInteractor;

    private int mTranslationY;

    private final KeyguardTransitionInteractor mKeyguardTransitionInteractor;

    private final KeyguardDismissTransitionInteractor mKeyguardDismissTransitionInteractor;

    private final DevicePolicyManager mDevicePolicyManager;

    // Whether the volume keys should be handled by keyguard. If true, then

    // they will be handled here for specific media types such as music, otherwise
@@ -321,7 +321,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
            }



            if (KeyguardWmStateRefactor.isEnabled()) {

                mKeyguardTransitionInteractor.startDismissKeyguardTransition(

                mKeyguardDismissTransitionInteractor.startDismissKeyguardTransition(

                        "KeyguardSecurityContainerController#finish");

            }

        }
@@ -458,7 +458,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
            DeviceProvisionedController deviceProvisionedController,

            FaceAuthAccessibilityDelegate faceAuthAccessibilityDelegate,

            DevicePolicyManager devicePolicyManager,

            KeyguardTransitionInteractor keyguardTransitionInteractor,

            KeyguardDismissTransitionInteractor keyguardDismissTransitionInteractor,

            Lazy<PrimaryBouncerInteractor> primaryBouncerInteractor,

            Provider<DeviceEntryInteractor> deviceEntryInteractor

    ) {
@@ -490,7 +490,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
        mSelectedUserInteractor = selectedUserInteractor;

        mDeviceEntryInteractor = deviceEntryInteractor;

        mJavaAdapter = javaAdapter;

        mKeyguardTransitionInteractor = keyguardTransitionInteractor;

        mKeyguardDismissTransitionInteractor = keyguardDismissTransitionInteractor;

        mDeviceProvisionedController = deviceProvisionedController;

        mPrimaryBouncerInteractor = primaryBouncerInteractor;

        mDevicePolicyManager = devicePolicyManager;

packages/SystemUI/src/com/android/systemui/keyguard/WindowManagerLockscreenVisibilityManager.kt

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.view.RemoteAnimationTarget 
import android.view.WindowManager

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Main

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

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

import com.android.systemui.keyguard.ui.binder.KeyguardSurfaceBehindParamsApplier

import com.android.systemui.statusbar.policy.KeyguardStateController

import java.util.concurrent.Executor
@@ -41,7 +41,7 @@ constructor( 
    private val activityTaskManagerService: IActivityTaskManager,

    private val keyguardStateController: KeyguardStateController,

    private val keyguardSurfaceBehindAnimator: KeyguardSurfaceBehindParamsApplier,

    private val keyguardTransitionInteractor: KeyguardTransitionInteractor,

    private val keyguardDismissTransitionInteractor: KeyguardDismissTransitionInteractor,

) {



    /**
@@ -148,7 +148,7 @@ constructor( 
        // a transition to GONE. This transition needs to start even if we're not provided an app

        // animation target - it's possible the app is destroyed on creation, etc. but we'll still

        // be unlocking.

        keyguardTransitionInteractor.startDismissKeyguardTransition(

        keyguardDismissTransitionInteractor.startDismissKeyguardTransition(

            reason = "Going away remote animation started"

        )