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

Commit 92fe4ff2 authored by Julia Tuttle's avatar Julia Tuttle
Browse files

Fix some Flexi-only AOD RON glitches 

Bug: 369151941
Flag: com.android.systemui.aod_ui_rich_ongoing
Test: manual
Change-Id: I7d9d3cf134c558ee078607e0cfb7e6564f4bc665
parent 89182a14

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

+27 −11
Original line number Original line Diff line number Diff line
@@ -109,6 +109,12 @@ constructor( 
                            }

                            }

                            if (isShadeLayoutWide && !isBypassEnabled) {

                            if (isShadeLayoutWide && !isBypassEnabled) {

                                with(notificationSection) {

                                with(notificationSection) {

                                    Box(modifier = Modifier.fillMaxHeight()) {

                                        AodPromotedNotificationArea(

                                            modifier =

                                                Modifier.fillMaxWidth(0.5f)

                                                    .align(alignment = Alignment.TopStart)

                                        )

                                        Notifications(

                                        Notifications(

                                            areNotificationsVisible = areNotificationsVisible,

                                            areNotificationsVisible = areNotificationsVisible,

                                            isShadeLayoutWide = true,

                                            isShadeLayoutWide = true,
@@ -121,6 +127,7 @@ constructor( 
                                    }

                                    }

                                }

                                }

                            }

                            }

                        }





                        val aodIconPadding: Dp =

                        val aodIconPadding: Dp =

                            dimensionResource(R.dimen.below_clock_padding_start_icons)

                            dimensionResource(R.dimen.below_clock_padding_start_icons)
@@ -142,9 +149,18 @@ constructor( 
                                }

                                }

                            } else {

                            } else {

                                Column {

                                Column {

                                    if (!isShadeLayoutWide) {

                                        AodPromotedNotificationArea()

                                        AodPromotedNotificationArea()

                                    }

                                    AodNotificationIcons(

                                    AodNotificationIcons(

                                        modifier = Modifier.padding(start = aodIconPadding)

                                        modifier =

                                            Modifier.padding(

                                                top =

                                                    dimensionResource(

                                                        R.dimen.keyguard_status_view_bottom_margin

                                                    ),

                                                start = aodIconPadding,

                                            )

                                    )

                                    )

                                }

                                }

                            }

                            }