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

Commit 60dd0415 authored by Aaron Liu's avatar Aaron Liu
Browse files

Fix sections for align udfps. 

Fixes: 319480854
Test: switch between blueprints
Flag: NONE
Change-Id: Id0cfb69e6369db6b94da03339f02530befc02c8f
parent fd5d1ad6

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

+11 −5
Original line number Diff line number Diff line
@@ -17,12 +17,14 @@ 


package com.android.systemui.keyguard.ui.view.layout.blueprints



import com.android.systemui.communal.ui.view.layout.sections.CommunalTutorialIndicatorSection

import com.android.systemui.dagger.SysUISingleton

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

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

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

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

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

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

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

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

import com.android.systemui.keyguard.ui.view.layout.sections.DefaultNotificationStackScrollLayoutSection
@@ -31,7 +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.SplitShadeGuidelines

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

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

import java.util.Optional

import javax.inject.Inject
@@ -44,18 +46,20 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi 
class ShortcutsBesideUdfpsKeyguardBlueprint

@Inject

constructor(

    alignShortcutsToUdfpsSection: AlignShortcutsToUdfpsSection,

    defaultIndicationAreaSection: DefaultIndicationAreaSection,

    defaultDeviceEntrySection: DefaultDeviceEntrySection,

    @Named(KeyguardSectionsModule.KEYGUARD_AMBIENT_INDICATION_AREA_SECTION)

    defaultAmbientIndicationAreaSection: Optional<KeyguardSection>,

    defaultSettingsPopupMenuSection: DefaultSettingsPopupMenuSection,

    alignShortcutsToUdfpsSection: AlignShortcutsToUdfpsSection,

    defaultStatusViewSection: DefaultStatusViewSection,

    defaultStatusBarSection: DefaultStatusBarSection,

    splitShadeGuidelines: SplitShadeGuidelines,

    defaultNotificationStackScrollLayoutSection: DefaultNotificationStackScrollLayoutSection,

    aodNotificationIconsSection: AodNotificationIconsSection,

    aodBurnInSection: AodBurnInSection,

    communalTutorialIndicatorSection: CommunalTutorialIndicatorSection,

    clockSection: ClockSection,

    smartspaceSection: SmartspaceSection,

    udfpsAccessibilityOverlaySection: DefaultUdfpsAccessibilityOverlaySection,

) : KeyguardBlueprint {

    override val id: String = SHORTCUTS_BESIDE_UDFPS
@@ -63,15 +67,17 @@ constructor( 
    override val sections =

        listOfNotNull(

            defaultIndicationAreaSection,

            alignShortcutsToUdfpsSection,

            defaultAmbientIndicationAreaSection.getOrNull(),

            defaultSettingsPopupMenuSection,

            alignShortcutsToUdfpsSection,

            defaultStatusViewSection,

            defaultStatusBarSection,

            defaultNotificationStackScrollLayoutSection,

            splitShadeGuidelines,

            aodNotificationIconsSection,

            smartspaceSection,

            aodBurnInSection,

            communalTutorialIndicatorSection,

            clockSection,

            defaultDeviceEntrySection,

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

        )