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

Commit 65388c2c authored by Chandru S's avatar Chandru S
Browse files

Include keyguard dismiss action refactor as part of compose bouncer 

Test: Everything builds
Bug: 310005730
Flag: com.android.systemui.compose_bouncer
Flag: com.android.systemui.scene_container
Change-Id: I7e4640f70577ec5c64c271a89b866e75b21033bd
parent 7f460f89

packages/SystemUI/src/com/android/systemui/bouncer/shared/flag/ComposeBouncerFlags.kt

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ import com.android.systemui.scene.shared.flag.SceneContainerFlag 


object ComposeBouncerFlags {



    /** @see [isComposeBouncerOrSceneContainerEnabled] */

    val isEnabled: Boolean

        get() = isComposeBouncerOrSceneContainerEnabled()



    /**

     * Returns `true` if the Compose bouncer is enabled or if the scene container framework is

     * enabled; `false` otherwise.

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

+2 −2
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ package com.android.systemui.keyguard.ui.binder 


import com.android.keyguard.logging.KeyguardLogger

import com.android.systemui.CoreStartable

import com.android.systemui.bouncer.shared.flag.ComposeBouncerFlags

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

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

import com.android.systemui.log.core.LogLevel

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.util.kotlin.sample

import dagger.Lazy

import javax.inject.Inject
@@ -41,7 +41,7 @@ constructor( 
) : CoreStartable {



    override fun start() {

        if (!SceneContainerFlag.isEnabled) {

        if (!ComposeBouncerFlags.isEnabled) {

            return

        }

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

+2 −4
Original line number Diff line number Diff line
@@ -18,13 +18,12 @@ package com.android.systemui.keyguard.ui.binder 
import com.android.keyguard.ViewMediatorCallback

import com.android.keyguard.logging.KeyguardLogger

import com.android.systemui.CoreStartable

import com.android.systemui.bouncer.shared.flag.ComposeBouncerFlags

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.flags.FeatureFlagsClassic

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

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

import com.android.systemui.log.core.LogLevel

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.user.domain.interactor.SelectedUserInteractor

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope
@@ -40,11 +39,10 @@ constructor( 
    private val viewMediatorCallback: ViewMediatorCallback,

    @Application private val scope: CoroutineScope,

    private val keyguardLogger: KeyguardLogger,

    private val featureFlags: FeatureFlagsClassic,

) : CoreStartable {



    override fun start() {

        if (!SceneContainerFlag.isEnabled) {

        if (!ComposeBouncerFlags.isEnabled) {

            return

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.keyguard.ui.viewmodel 


import com.android.app.animation.Interpolators.EMPHASIZED_ACCELERATE

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

import com.android.systemui.bouncer.shared.flag.ComposeBouncerFlags

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

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

import com.android.systemui.keyguard.shared.model.KeyguardState
@@ -25,7 +26,6 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.GONE 
import com.android.systemui.keyguard.shared.model.KeyguardState.PRIMARY_BOUNCER

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

import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.statusbar.SysuiStatusBarStateController
@@ -51,7 +51,7 @@ constructor( 
) {

    /** Common fade for scrim alpha values during *BOUNCER->GONE */

    fun scrimAlpha(duration: Duration, fromState: KeyguardState): Flow<ScrimAlpha> {

        return if (SceneContainerFlag.isEnabled) {

        return if (ComposeBouncerFlags.isEnabled) {

            keyguardDismissActionInteractor

                .get()

                .willAnimateDismissActionOnLockscreen

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

+3 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.keyguard.ui.viewmodel



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

import com.android.systemui.bouncer.shared.flag.ComposeBouncerFlags

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.domain.interactor.FromPrimaryBouncerTransitionInteractor.Companion.TO_GONE_DURATION

import com.android.systemui.keyguard.domain.interactor.KeyguardDismissActionInteractor
@@ -25,7 +26,6 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.GONE 
import com.android.systemui.keyguard.shared.model.KeyguardState.PRIMARY_BOUNCER

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

import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.statusbar.SysuiStatusBarStateController

import dagger.Lazy

import javax.inject.Inject
@@ -85,7 +85,7 @@ constructor( 


    /** Bouncer container alpha */

    val bouncerAlpha: Flow<Float> =

        if (SceneContainerFlag.isEnabled) {

        if (ComposeBouncerFlags.isEnabled) {

            keyguardDismissActionInteractor

                .get()

                .willAnimateDismissActionOnLockscreen
@@ -110,7 +110,7 @@ constructor( 


    /** Lockscreen alpha */

    val lockscreenAlpha: Flow<Float> =

        if (SceneContainerFlag.isEnabled) {

        if (ComposeBouncerFlags.isEnabled) {

            keyguardDismissActionInteractor

                .get()

                .willAnimateDismissActionOnLockscreen