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

Commit 484b6734 authored by Christian Göllner's avatar Christian Göllner Committed by Automerger Merge Worker
Browse files

Merge "Fix left margin too big on split shade" into tm-dev am: 8507e74e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17135604

Change-Id: I6f70b9d07e6ef8a3ec454e8c886601e3dc8a944f
parents 5bf39d79 8507e74e

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQSContainerController.kt

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ class NotificationsQSContainerController @Inject constructor( 
        val endConstraintId = if (splitShadeEnabled) R.id.qs_edge_guideline else PARENT_ID

        constraintSet.apply {

            connect(R.id.qs_frame, END, endConstraintId, END)

            setMargin(R.id.qs_frame, START, panelMarginHorizontal)

            setMargin(R.id.qs_frame, START, if (splitShadeEnabled) 0 else panelMarginHorizontal)

            setMargin(R.id.qs_frame, END, if (splitShadeEnabled) 0 else panelMarginHorizontal)

            setMargin(R.id.qs_frame, TOP, topMargin)

        }

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationQSContainerControllerTest.kt

+20 −0
Original line number Diff line number Diff line
@@ -456,6 +456,26 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { 
                .isEqualTo(0)

    }



    @Test

    fun testSplitShadeLayout_qsFrameHasHorizontalMarginsOfZero() {

        enableSplitShade()

        controller.updateResources()

        assertThat(getConstraintSetLayout(R.id.qs_frame).endMargin).isEqualTo(0)

        assertThat(getConstraintSetLayout(R.id.qs_frame).startMargin).isEqualTo(0)

    }



    @Test

    fun testSinglePaneShadeLayout_qsFrameHasHorizontalMarginsSetToCorrectValue() {

        disableSplitShade()

        controller.updateResources()

        val notificationPanelMarginHorizontal = context.resources

                .getDimensionPixelSize(R.dimen.notification_panel_margin_horizontal)

        assertThat(getConstraintSetLayout(R.id.qs_frame).endMargin)

                .isEqualTo(notificationPanelMarginHorizontal)

        assertThat(getConstraintSetLayout(R.id.qs_frame).startMargin)

                .isEqualTo(notificationPanelMarginHorizontal)

    }



    @Test

    fun testSinglePaneShadeLayout_isAlignedToParent() {

        disableSplitShade()