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

Commit e59558e7 authored by Julia Tuttle's avatar Julia Tuttle Committed by Android (Google) Code Review
Browse files

Merge "Add AOD RON to pre-Flexi split shade" into main

parents de4beb41 d3db5960

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

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardSection 
import com.android.systemui.keyguard.ui.view.layout.sections.AccessibilityActionsSection

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.AodPromotedNotificationSection

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
@@ -58,6 +59,7 @@ constructor( 
    defaultStatusBarSection: DefaultStatusBarSection,

    splitShadeNotificationStackScrollLayoutSection: SplitShadeNotificationStackScrollLayoutSection,

    splitShadeGuidelines: SplitShadeGuidelines,

    aodPromotedNotificationSection: AodPromotedNotificationSection,

    aodNotificationIconsSection: AodNotificationIconsSection,

    aodBurnInSection: AodBurnInSection,

    clockSection: ClockSection,
@@ -76,6 +78,7 @@ constructor( 
            defaultStatusBarSection,

            splitShadeNotificationStackScrollLayoutSection,

            splitShadeGuidelines,

            aodPromotedNotificationSection,

            aodNotificationIconsSection,

            smartspaceSection,

            aodBurnInSection,

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AodPromotedNotificationSection.kt

+6 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import androidx.constraintlayout.widget.ConstraintSet.START 
import androidx.constraintlayout.widget.ConstraintSet.TOP

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

import com.android.systemui.res.R

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

import com.android.systemui.statusbar.notification.promoted.AODPromotedNotification

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationLogger

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUiAod
@@ -36,6 +37,7 @@ class AodPromotedNotificationSection 
@Inject

constructor(

    private val viewModelFactory: AODPromotedNotificationViewModel.Factory,

    private val shadeInteractor: ShadeInteractor,

    private val logger: PromotedNotificationLogger,

) : KeyguardSection() {

    var view: ComposeView? = null
@@ -77,9 +79,12 @@ constructor( 
        checkNotNull(view)



        constraintSet.apply {

            val isShadeLayoutWide = shadeInteractor.isShadeLayoutWide.value

            val endGuidelineId = if (isShadeLayoutWide) R.id.split_shade_guideline else PARENT_ID



            connect(viewId, TOP, R.id.smart_space_barrier_bottom, BOTTOM, 0)

            connect(viewId, START, PARENT_ID, START, 0)

            connect(viewId, END, PARENT_ID, END, 0)

            connect(viewId, END, endGuidelineId, END, 0)



            constrainWidth(viewId, ConstraintSet.MATCH_CONSTRAINT)

            constrainHeight(viewId, ConstraintSet.WRAP_CONTENT)

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepositoryKosmos.kt

+2 −1
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ val Kosmos.defaultKeyguardBlueprint by 
            defaultSettingsPopupMenuSection = mock(),

            defaultStatusBarSection = mock(),

            defaultNotificationStackScrollLayoutSection = mock(),

            aodPromotedNotificationSection = mock(),

            aodNotificationIconsSection = mock(),

            aodBurnInSection = mock(),

            clockSection = keyguardClockSection,
@@ -69,7 +70,6 @@ val Kosmos.defaultKeyguardBlueprint by 
            keyguardSliceViewSection = mock(),

            udfpsAccessibilityOverlaySection = mock(),

            accessibilityActionsSection = mock(),

            aodPromotedNotificationSection = mock(),

        )

    }
@@ -84,6 +84,7 @@ val Kosmos.splitShadeBlueprint by 
            defaultStatusBarSection = mock(),

            splitShadeNotificationStackScrollLayoutSection = mock(),

            splitShadeGuidelines = mock(),

            aodPromotedNotificationSection = mock(),

            aodNotificationIconsSection = mock(),

            aodBurnInSection = mock(),

            clockSection = keyguardClockSection,