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

Commit feb4d890 authored by burakov's avatar burakov Committed by Danny Burakov
Browse files

[Dual Shade] Align the shade to the center on narrow screens. 

Fix: 395069490
Test: Tested manually by swiping down both shades on a folded and
 unfolded screen, and verifying the animation is center-aligned in the
 former, and left/right aligned in the latter.
Flag: com.android.systemui.scene_container
Change-Id: I4152fefd87cb8bbadd28578c9da0921b3ab22c57
parent b1c163f2

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationsShadeOverlay.kt

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ constructor( 


        OverlayShade(

            panelElement = NotificationsShade.Elements.Panel,

            panelAlignment = Alignment.TopStart,

            alignmentOnWideScreens = Alignment.TopStart,

            modifier = modifier,

            onScrimClicked = viewModel::onScrimClicked,

            header = {

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsShadeOverlay.kt

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ constructor( 
            )

            OverlayShade(

                panelElement = QuickSettingsShade.Elements.Panel,

                panelAlignment = Alignment.TopEnd,

                alignmentOnWideScreens = Alignment.TopEnd,

                onScrimClicked = contentViewModel::onScrimClicked,

                header = {

                    OverlayShadeHeader(

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/OverlayShade.kt

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ import com.android.systemui.res.R 
@Composable

fun ContentScope.OverlayShade(

    panelElement: ElementKey,

    panelAlignment: Alignment,

    alignmentOnWideScreens: Alignment,

    onScrimClicked: () -> Unit,

    modifier: Modifier = Modifier,

    header: @Composable () -> Unit,
@@ -71,7 +71,7 @@ fun ContentScope.OverlayShade( 


        Box(

            modifier = Modifier.fillMaxSize().panelContainerPadding(isFullWidth),

            contentAlignment = panelAlignment,

            contentAlignment = if (isFullWidth) Alignment.TopCenter else alignmentOnWideScreens,

        ) {

            Panel(

                modifier =