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

Commit 7f68b733 authored by Chandru S's avatar Chandru S Committed by Android (Google) Code Review
Browse files

Merge "Separates primary bouncer transition module into 2 separate modules (decl & impl)" into main

parents 4b359dfe 751e11ac

packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor; 
import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionBootInteractor;

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

import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransitionModule;

import com.android.systemui.keyguard.ui.transitions.PrimaryBouncerTransitionModule;

import com.android.systemui.keyguard.ui.view.AlternateBouncerWindowViewBinder;

import com.android.systemui.keyguard.ui.viewmodel.KeyguardQuickAffordancesCombinedViewModelModule;

import com.android.systemui.log.SessionTracker;
@@ -110,6 +109,7 @@ import java.util.concurrent.Executor; 
            DeviceEntryIconTransitionModule.class,

            FalsingModule.class,

            PrimaryBouncerTransitionModule.class,

            PrimaryBouncerTransitionImplModule.class,

            KeyguardDataQuickAffordanceModule.class,

            KeyguardQuickAffordancesCombinedViewModelModule.class,

            KeyguardRepositoryModule.class,

packages/SystemUI/src/com/android/systemui/keyguard/dagger/PrimaryBouncerTransitionModule.kt

0 → 100644
+131 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.keyguard.dagger



import android.content.res.Resources

import com.android.systemui.dagger.SysUISingleton

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

import com.android.systemui.keyguard.ui.transitions.BlurConfig

import com.android.systemui.keyguard.ui.transitions.PrimaryBouncerTransition

import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.AodToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.DozingToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.GlanceableHubToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.LockscreenToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.OccludedToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToAodTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToDozingTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGlanceableHubTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGoneTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToLockscreenTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToOccludedTransitionViewModel

import com.android.systemui.res.R

import com.android.systemui.window.flag.WindowBlurFlag

import dagger.Binds

import dagger.Module

import dagger.Provides

import dagger.multibindings.IntoSet

import dagger.multibindings.Multibinds

import kotlinx.coroutines.ExperimentalCoroutinesApi



/**

 * Base module that defines the [PrimaryBouncerTransition] multibinding. All variants of SystemUI

 * can install this module to get the default empty version of the multibinding

 */

@Module

interface PrimaryBouncerTransitionModule {

    @Multibinds fun primaryBouncerTransitions(): Set<PrimaryBouncerTransition>



    companion object {

        @Provides

        @SysUISingleton

        fun provideBlurConfig(@Main resources: Resources): BlurConfig {

            val minBlurRadius = resources.getDimensionPixelSize(R.dimen.min_window_blur_radius)

            val maxBlurRadius =

                if (WindowBlurFlag.isEnabled) {

                    resources.getDimensionPixelSize(R.dimen.max_shade_window_blur_radius)

                } else {

                    resources.getDimensionPixelSize(R.dimen.max_window_blur_radius)

                }

            return BlurConfig(minBlurRadius.toFloat(), maxBlurRadius.toFloat())

        }

    }

}



/**

 * Module that installs all the implementations of [PrimaryBouncerTransition] from different

 * keyguard states to and away from the primary bouncer.

 */

@ExperimentalCoroutinesApi

@Module

interface PrimaryBouncerTransitionImplModule {

    @Binds

    @IntoSet

    fun fromAod(impl: AodToPrimaryBouncerTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun fromAlternateBouncer(

        impl: AlternateBouncerToPrimaryBouncerTransitionViewModel

    ): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun fromDozing(impl: DozingToPrimaryBouncerTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun fromLockscreen(

        impl: LockscreenToPrimaryBouncerTransitionViewModel

    ): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun fromGlanceableHub(

        impl: GlanceableHubToPrimaryBouncerTransitionViewModel

    ): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun fromOccluded(impl: OccludedToPrimaryBouncerTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toAod(impl: PrimaryBouncerToAodTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toLockscreen(impl: PrimaryBouncerToLockscreenTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toDozing(impl: PrimaryBouncerToDozingTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toGlanceableHub(

        impl: PrimaryBouncerToGlanceableHubTransitionViewModel

    ): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toGone(impl: PrimaryBouncerToGoneTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toOccluded(impl: PrimaryBouncerToOccludedTransitionViewModel): PrimaryBouncerTransition

}

packages/SystemUI/src/com/android/systemui/keyguard/ui/transitions/BlurConfig.kt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.keyguard.ui.transitions



import javax.inject.Inject



/** Config that provides the max and min blur radius for the window blurs. */

data class BlurConfig(val minBlurRadiusPx: Float, val maxBlurRadiusPx: Float) {

    // No-op config that will be used by dagger of other SysUI variants which don't blur the

    // background surface.

    @Inject constructor() : this(0.0f, 0.0f)

}

packages/SystemUI/src/com/android/systemui/keyguard/ui/transitions/PrimaryBouncerTransition.kt

+4 −114
Original line number Diff line number Diff line
@@ -16,37 +16,15 @@ 


package com.android.systemui.keyguard.ui.transitions



import android.content.res.Resources

import android.util.MathUtils

import com.android.systemui.dagger.SysUISingleton

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

import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.AodToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.DozingToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.GlanceableHubToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.LockscreenToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.OccludedToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToAodTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToDozingTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGlanceableHubTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGoneTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToLockscreenTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToOccludedTransitionViewModel

import com.android.systemui.res.R

import com.android.systemui.window.flag.WindowBlurFlag

import dagger.Binds

import dagger.Module

import dagger.Provides

import dagger.multibindings.IntoSet

import javax.inject.Inject

import kotlinx.coroutines.ExperimentalCoroutinesApi

import android.util.MathUtils.lerp

import kotlinx.coroutines.flow.Flow



/**

 * Each PrimaryBouncerTransition is responsible for updating various UI states based on the nature

 * of the transition.

 *

 * MUST list implementing classes in dagger module [PrimaryBouncerTransitionModule].

 * MUST list implementing classes in dagger module

 * [com.android.systemui.keyguard.dagger.PrimaryBouncerTransitionImplModule].

 */

interface PrimaryBouncerTransition {

    /** Radius of blur applied to the window's root view. */
@@ -56,93 +34,5 @@ interface PrimaryBouncerTransition { 
        starBlurRadius: Float,

        endBlurRadius: Float,

        transitionProgress: Float,

    ): Float {

        return MathUtils.lerp(starBlurRadius, endBlurRadius, transitionProgress)

    }

}



/**

 * Module that installs all the transitions from different keyguard states to and away from the

 * primary bouncer.

 */

@ExperimentalCoroutinesApi

@Module

interface PrimaryBouncerTransitionModule {

    @Binds

    @IntoSet

    fun fromAod(impl: AodToPrimaryBouncerTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun fromAlternateBouncer(

        impl: AlternateBouncerToPrimaryBouncerTransitionViewModel

    ): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun fromDozing(impl: DozingToPrimaryBouncerTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun fromLockscreen(

        impl: LockscreenToPrimaryBouncerTransitionViewModel

    ): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun fromGlanceableHub(

        impl: GlanceableHubToPrimaryBouncerTransitionViewModel

    ): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun fromOccluded(impl: OccludedToPrimaryBouncerTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toAod(impl: PrimaryBouncerToAodTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toLockscreen(impl: PrimaryBouncerToLockscreenTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toDozing(impl: PrimaryBouncerToDozingTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toGlanceableHub(

        impl: PrimaryBouncerToGlanceableHubTransitionViewModel

    ): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toGone(impl: PrimaryBouncerToGoneTransitionViewModel): PrimaryBouncerTransition



    @Binds

    @IntoSet

    fun toOccluded(impl: PrimaryBouncerToOccludedTransitionViewModel): PrimaryBouncerTransition



    companion object {

        @Provides

        @SysUISingleton

        fun provideBlurConfig(@Main resources: Resources): BlurConfig {

            val minBlurRadius = resources.getDimensionPixelSize(R.dimen.min_window_blur_radius)

            val maxBlurRadius =

                if (WindowBlurFlag.isEnabled) {

                    resources.getDimensionPixelSize(R.dimen.max_shade_window_blur_radius)

                } else {

                    resources.getDimensionPixelSize(R.dimen.max_window_blur_radius)

                }

            return BlurConfig(minBlurRadius.toFloat(), maxBlurRadius.toFloat())

        }

    }

}



/** Config that provides the max and min blur radius for the window blurs. */

data class BlurConfig(val minBlurRadiusPx: Float, val maxBlurRadiusPx: Float) {

    // No-op config that will be used by dagger of other SysUI variants which don't blur the

    // background surface.

    @Inject constructor() : this(0.0f, 0.0f)

    ): Float = lerp(starBlurRadius, endBlurRadius, transitionProgress)

}