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

Commit b93677ce authored by Matt Pietal's avatar Matt Pietal
Browse files

Migrate keyguard slice view 

Also prevent the smartspace section from attempting to add smartspace
when it is disabled.

Fixes: 310208118
Fixes: 325240672
Test: use AOSP build or manually disable smartspace to ensure on
crashes and correct alignment
Flag: ACONFIG com.android.systemui.keyguard_shade_migration_nssl
STAGING
Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint
DEVELOPMENT
Flag: ACONFIG com.android.systemui.keyguard_bottom_area_refactor
STAGING

Change-Id: I675b5a9101656cf0120e6c4805a79a5411e8b97c
parent 6a3246f0

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

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.android.systemui.keyguard.ui.viewmodel.KeyguardBlueprintViewModel 
import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel

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

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

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

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

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

import com.android.systemui.plugins.FalsingManager
@@ -98,6 +99,7 @@ constructor( 
    private val falsingManager: FalsingManager,

    private val aodAlphaViewModel: AodAlphaViewModel,

    private val keyguardClockViewModel: KeyguardClockViewModel,

    private val smartspaceViewModel: KeyguardSmartspaceViewModel,

    private val lockscreenContentViewModel: LockscreenContentViewModel,

    private val lockscreenSceneBlueprintsLazy: Lazy<Set<LockscreenSceneBlueprint>>,

    private val keyguardBlueprintViewBinder: KeyguardBlueprintViewBinder,
@@ -148,6 +150,7 @@ constructor( 
                    keyguardRootView,

                    keyguardBlueprintViewModel,

                    keyguardClockViewModel,

                    smartspaceViewModel,

                )

            }

        }

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

+17 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.Intra 
import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition.Config

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

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

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

import com.android.systemui.lifecycle.repeatWhenAttached

import javax.inject.Inject

import kotlin.math.max
@@ -84,6 +85,7 @@ constructor( 
        constraintLayout: ConstraintLayout,

        viewModel: KeyguardBlueprintViewModel,

        clockViewModel: KeyguardClockViewModel,

        smartspaceViewModel: KeyguardSmartspaceViewModel,

    ) {

        constraintLayout.repeatWhenAttached {

            repeatOnLifecycle(Lifecycle.State.CREATED) {
@@ -108,10 +110,18 @@ constructor( 
                            ) {

                                BaseBlueprintTransition(clockViewModel)

                                    .addTransition(

                                        IntraBlueprintTransition(Config.DEFAULT, clockViewModel)

                                        IntraBlueprintTransition(

                                            Config.DEFAULT,

                                            clockViewModel,

                                            smartspaceViewModel

                                        )

                                    )

                            } else {

                                IntraBlueprintTransition(Config.DEFAULT, clockViewModel)

                                IntraBlueprintTransition(

                                    Config.DEFAULT,

                                    clockViewModel,

                                    smartspaceViewModel

                                )

                            }



                        runTransition(constraintLayout, transition, Config.DEFAULT) {
@@ -136,7 +146,11 @@ constructor( 


                        runTransition(

                            constraintLayout,

                            IntraBlueprintTransition(transition, clockViewModel),

                            IntraBlueprintTransition(

                                transition,

                                clockViewModel,

                                smartspaceViewModel

                            ),

                            transition,

                        ) {

                            cs.applyTo(constraintLayout)

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/DefaultKeyguardBlueprint.kt

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.systemui.keyguard.ui.view.layout.sections.DefaultStatusBarSec 
import com.android.systemui.keyguard.ui.view.layout.sections.DefaultStatusViewSection

import com.android.systemui.keyguard.ui.view.layout.sections.DefaultUdfpsAccessibilityOverlaySection

import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSectionsModule.Companion.KEYGUARD_AMBIENT_INDICATION_AREA_SECTION

import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSliceViewSection

import com.android.systemui.keyguard.ui.view.layout.sections.SmartspaceSection

import java.util.Optional

import javax.inject.Inject
@@ -65,6 +66,7 @@ constructor( 
    communalTutorialIndicatorSection: CommunalTutorialIndicatorSection,

    clockSection: ClockSection,

    smartspaceSection: SmartspaceSection,

    keyguardSliceViewSection: KeyguardSliceViewSection,

    udfpsAccessibilityOverlaySection: DefaultUdfpsAccessibilityOverlaySection,

) : KeyguardBlueprint {

    override val id: String = DEFAULT
@@ -83,6 +85,7 @@ constructor( 
            aodBurnInSection,

            communalTutorialIndicatorSection,

            clockSection,

            keyguardSliceViewSection,

            defaultDeviceEntrySection,

            udfpsAccessibilityOverlaySection, // Add LAST: Intentionally has z-order above others

        )

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/ShortcutsBesideUdfpsKeyguardBlueprint.kt

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.systemui.keyguard.ui.view.layout.sections.DefaultStatusBarSec 
import com.android.systemui.keyguard.ui.view.layout.sections.DefaultStatusViewSection

import com.android.systemui.keyguard.ui.view.layout.sections.DefaultUdfpsAccessibilityOverlaySection

import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSectionsModule

import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSliceViewSection

import com.android.systemui.keyguard.ui.view.layout.sections.SmartspaceSection

import com.android.systemui.util.kotlin.getOrNull

import java.util.Optional
@@ -60,6 +61,7 @@ constructor( 
    communalTutorialIndicatorSection: CommunalTutorialIndicatorSection,

    clockSection: ClockSection,

    smartspaceSection: SmartspaceSection,

    keyguardSliceViewSection: KeyguardSliceViewSection,

    udfpsAccessibilityOverlaySection: DefaultUdfpsAccessibilityOverlaySection,

) : KeyguardBlueprint {

    override val id: String = SHORTCUTS_BESIDE_UDFPS
@@ -78,6 +80,7 @@ constructor( 
            aodBurnInSection,

            communalTutorialIndicatorSection,

            clockSection,

            keyguardSliceViewSection,

            defaultDeviceEntrySection,

            udfpsAccessibilityOverlaySection, // Add LAST: Intentionally has z-order above others

        )

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/IntraBlueprintTransition.kt

+3 −1
Original line number Diff line number Diff line
@@ -20,10 +20,12 @@ import android.transition.TransitionSet 
import com.android.systemui.keyguard.ui.view.layout.sections.transitions.ClockSizeTransition

import com.android.systemui.keyguard.ui.view.layout.sections.transitions.DefaultClockSteppingTransition

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

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



class IntraBlueprintTransition(

    config: IntraBlueprintTransition.Config,

    clockViewModel: KeyguardClockViewModel,

    smartspaceViewModel: KeyguardSmartspaceViewModel,

) : TransitionSet() {



    enum class Type(
@@ -56,7 +58,7 @@ class IntraBlueprintTransition( 
            Type.NoTransition -> {}

            Type.DefaultClockStepping ->

                addTransition(clockViewModel.clock?.let { DefaultClockSteppingTransition(it) })

            else -> addTransition(ClockSizeTransition(config, clockViewModel))

            else -> addTransition(ClockSizeTransition(config, clockViewModel, smartspaceViewModel))

        }

    }

}