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

Commit 859821e3 authored by Julia Tuttle's avatar Julia Tuttle
Browse files

Start fleshing out AOD RONs 

Bug: 369151941
Flag: com.android.systemui.aod_ui_rich_ongoing
Test: TBD
Change-Id: I80a3d60a27b94544784879f2bf27ed54290f5195
parent 5ea9b08e

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt

+17 −8
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.systemui.keyguard.ui.composable.section.StatusBarSection 
import com.android.systemui.keyguard.ui.composable.section.TopAreaSection

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

import com.android.systemui.res.R

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

import java.util.Optional

import javax.inject.Inject

import kotlin.math.roundToInt
@@ -128,11 +129,14 @@ constructor( 
                        with(notificationSection) {

                            if (!isShadeLayoutWide && !isBypassEnabled) {

                                Box(modifier = Modifier.weight(weight = 1f)) {

                                    Column(Modifier.align(alignment = Alignment.TopStart)) {

                                        if (PromotedNotificationUiAod.isEnabled) {

                                            AodPromotedNotification()

                                        }

                                        AodNotificationIcons(

                                        modifier =

                                            Modifier.align(alignment = Alignment.TopStart)

                                                .padding(start = aodIconPadding)

                                            modifier = Modifier.padding(start = aodIconPadding)

                                        )

                                    }

                                    Notifications(

                                        areNotificationsVisible = areNotificationsVisible,

                                        isShadeLayoutWide = false,
@@ -140,11 +144,16 @@ constructor( 
                                    )

                                }

                            } else {

                                Column {

                                    if (PromotedNotificationUiAod.isEnabled) {

                                        AodPromotedNotification()

                                    }

                                    AodNotificationIcons(

                                        modifier = Modifier.padding(start = aodIconPadding)

                                    )

                                }

                            }

                        }

                        if (!isUdfpsVisible && ambientIndicationSectionOptional.isPresent) {

                            with(ambientIndicationSectionOptional.get()) {

                                AmbientIndication(modifier = Modifier.fillMaxWidth())

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt

+8 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ import com.android.systemui.statusbar.notification.icon.ui.viewbinder.AlwaysOnDi 
import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.StatusBarIconViewBindingFailureTracker

import com.android.systemui.statusbar.notification.icon.ui.viewmodel.NotificationIconContainerAlwaysOnDisplayViewModel

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

import com.android.systemui.statusbar.notification.promoted.ui.viewmodel.AODPromotedNotificationViewModel

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout

import com.android.systemui.statusbar.notification.stack.ui.view.NotificationScrollView

import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer
@@ -84,6 +86,7 @@ constructor( 
    private val iconBindingFailureTracker: StatusBarIconViewBindingFailureTracker,

    private val nicAodViewModel: NotificationIconContainerAlwaysOnDisplayViewModel,

    private val nicAodIconViewStore: AlwaysOnDisplayNotificationIconViewStore,

    private val aodPromotedNotificationViewModelFactory: AODPromotedNotificationViewModel.Factory,

    private val systemBarUtilsState: SystemBarUtilsState,

    private val clockInteractor: KeyguardClockInteractor,

) {
@@ -106,6 +109,11 @@ constructor( 
        )

    }



    @Composable

    fun AodPromotedNotification() {

        AODPromotedNotification(aodPromotedNotificationViewModelFactory)

    }



    @Composable

    fun AodNotificationIcons(modifier: Modifier = Modifier) {

        val isVisible by

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

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.android.systemui.keyguard.ui.view.KeyguardRootView 
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
@@ -68,6 +69,7 @@ class DefaultKeyguardBlueprintTest : SysuiTestCase() { 
    @Mock private lateinit var defaultStatusBarViewSection: DefaultStatusBarSection

    @Mock private lateinit var defaultNSSLSection: DefaultNotificationStackScrollLayoutSection

    @Mock private lateinit var splitShadeGuidelines: SplitShadeGuidelines

    @Mock private lateinit var aodPromotedNotificationSection: AodPromotedNotificationSection

    @Mock private lateinit var aodNotificationIconsSection: AodNotificationIconsSection

    @Mock private lateinit var aodBurnInSection: AodBurnInSection

    @Mock private lateinit var clockSection: ClockSection
@@ -90,6 +92,7 @@ class DefaultKeyguardBlueprintTest : SysuiTestCase() { 
                defaultSettingsPopupMenuSection,

                defaultStatusBarViewSection,

                defaultNSSLSection,

                aodPromotedNotificationSection,

                aodNotificationIconsSection,

                aodBurnInSection,

                clockSection,

packages/SystemUI/res/values/ids.xml

+2 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ 
    <item type="id" name="accessibility_actions_view" />

    <item type="id" name="ambient_indication_container" />

    <item type="id" name="aod_notification_icon_container" />

    <item type="id" name="aod_promoted_notification_frame" />

    <item type="id" name="burn_in_layer" />

    <item type="id" name="burn_in_layer_empty_view" />

    <item type="id" name="communal_tutorial_indicator" />
@@ -291,4 +292,5 @@ 


    <item type="id" name="brightness_dialog_slider" />



    <item type="id" name="aod_promoted_notification_view_updater_tag" />

</resources>

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/DefaultKeyguardBlueprint.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
@@ -60,6 +61,7 @@ constructor( 
    defaultSettingsPopupMenuSection: DefaultSettingsPopupMenuSection,

    defaultStatusBarSection: DefaultStatusBarSection,

    defaultNotificationStackScrollLayoutSection: DefaultNotificationStackScrollLayoutSection,

    aodPromotedNotificationSection: AodPromotedNotificationSection,

    aodNotificationIconsSection: AodNotificationIconsSection,

    aodBurnInSection: AodBurnInSection,

    clockSection: ClockSection,
@@ -79,6 +81,7 @@ constructor( 
            defaultStatusBarSection,

            defaultNotificationStackScrollLayoutSection,

            aodNotificationIconsSection,

            aodPromotedNotificationSection,

            smartspaceSection,

            aodBurnInSection,

            clockSection,