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

Commit 6ef425b8 authored by Dmitrii's avatar Dmitrii Committed by Bruno Martins
Browse files

VolumeDialog: Fix layout issues with left gravity 



* Prevent clipping of landscape ringer dialog

Change-Id: I0761ea04e46312377c504f10b345a59d68df5d92
Signed-off-by: default avatarDmitrii <bankersenator@gmail.com>
parent db693af9

packages/SystemUI/res/layout/volume_dialog.xml

+6 −6
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    android:layout_gravity="end"

    android:alpha="0"

    android:clipChildren="false"

    android:minWidth="@dimen/volume_dialog_width">

    android:minWidth="@dimen/volume_dialog_window_width">



    <View

        android:id="@+id/volume_dialog_background"
@@ -42,9 +42,9 @@ 
        android:layout_marginBottom="@dimen/volume_dialog_components_spacing"

        android:clipChildren="false"

        app:layout_constraintBottom_toTopOf="@id/volume_dialog_main_slider_container"

        app:layout_constraintRight_toRightOf="@id/volume_dialog_background"

        app:layout_constraintEnd_toEndOf="@id/volume_dialog_background"

        app:layout_constraintHeight_default="spread"

        app:layout_constraintLeft_toLeftOf="parent"

        app:layout_constraintStart_toStartOf="@id/volume_dialog_background"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintWidth_default="spread">
@@ -75,9 +75,9 @@ 
        android:layout_marginTop="@dimen/volume_dialog_components_spacing"

        android:clipChildren="false"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintRight_toRightOf="@id/volume_dialog_background"

        app:layout_constraintEnd_toEndOf="@id/volume_dialog_background"

        app:layout_constraintHeight_default="wrap"

        app:layout_constraintLeft_toLeftOf="@id/volume_dialog_background"

        app:layout_constraintStart_toStartOf="@id/volume_dialog_background"

        app:layout_constraintTop_toBottomOf="@id/volume_dialog_main_slider_container"

        app:layout_constraintVertical_bias="0"

        app:layout_constraintWidth_default="wrap">
@@ -99,7 +99,7 @@ 
        android:orientation="horizontal"

        android:showDividers="middle|beginning|end"

        app:layout_constraintBottom_toBottomOf="@id/volume_dialog_main_slider_container"

        app:layout_constraintStart_toEndOf="@id/volume_dialog_background"

        app:layout_constraintEnd_toStartOf="@id/volume_dialog_background"

        app:layout_constraintTop_toTopOf="@id/volume_dialog_main_slider_container" />



</androidx.constraintlayout.widget.ConstraintLayout>

packages/SystemUI/src/com/android/systemui/volume/dialog/VolumeDialog.kt

+8 −1
Original line number Diff line number Diff line
@@ -74,7 +74,14 @@ constructor( 


    private fun applyLayoutAndGravity() {

        val win = window ?: return

        val side = if (volumePanelOnLeft) Gravity.START else Gravity.END

        val side = if (volumePanelOnLeft) Gravity.LEFT else Gravity.RIGHT

        val dialogView = win.decorView



        dialogView.layoutDirection =

            if (volumePanelOnLeft)

                View.LAYOUT_DIRECTION_RTL

            else

                View.LAYOUT_DIRECTION_LTR



        if (isVolumeDialogVertical) {

            win.setLayout(

packages/SystemUI/src/com/android/systemui/volume/dialog/ringer/ui/util/RingerDrawerConstraintsUtils.kt

+11 −11
Original line number Diff line number Diff line
@@ -59,10 +59,10 @@ private fun ConstraintSet.setButtonPositionPortraitConstraints( 
            ConstraintSet.TOP,

        )

    }

    connect(button.id, ConstraintSet.RIGHT, motionLayout.id, ConstraintSet.RIGHT)

    connect(button.id, ConstraintSet.END, motionLayout.id, ConstraintSet.END)

    setMargin(

        button.id,

        ConstraintSet.RIGHT,

        ConstraintSet.END,

        motionLayout.context.resources.getDimensionPixelSize(

            R.dimen.volume_dialog_background_margin

        ),
@@ -75,10 +75,10 @@ private fun ConstraintSet.setButtonPositionLandscapeConstraints( 
    button: View,

) {

    if (motionLayout.getChildAt(index + 1) == null) {

        connect(button.id, ConstraintSet.RIGHT, motionLayout.id, ConstraintSet.RIGHT)

        connect(button.id, ConstraintSet.END, motionLayout.id, ConstraintSet.END)

        setMargin(

            button.id,

            ConstraintSet.RIGHT,

            ConstraintSet.END,

            motionLayout.context.resources.getDimensionPixelSize(

                R.dimen.volume_dialog_background_margin

            ),
@@ -86,16 +86,16 @@ private fun ConstraintSet.setButtonPositionLandscapeConstraints( 
    } else {

        connect(

            button.id,

            ConstraintSet.RIGHT,

            ConstraintSet.END,

            motionLayout.getChildAt(index + 1).id,

            ConstraintSet.LEFT,

            ConstraintSet.START,

        )

    }

    connect(button.id, ConstraintSet.BOTTOM, motionLayout.id, ConstraintSet.BOTTOM)



    // Index 1 is the first button in the children of motionLayout.

    if (index == 1) {

        clear(button.id, ConstraintSet.LEFT)

        clear(button.id, ConstraintSet.START)

    }

}
@@ -165,7 +165,7 @@ private fun ConstraintSet.adjustOpenConstraintsForDrawer( 
                },

            )

            connect(view.id, ConstraintSet.BOTTOM, motionLayout.id, ConstraintSet.BOTTOM)

            connect(view.id, ConstraintSet.RIGHT, motionLayout.id, ConstraintSet.RIGHT)

            connect(view.id, ConstraintSet.END, motionLayout.id, ConstraintSet.END)

            setMargin(

                view.id,

                ConstraintSet.BOTTOM,
@@ -200,7 +200,7 @@ private fun ConstraintSet.adjustClosedConstraintsForDrawer( 
                                .toInt(),

                        )

                    } else {

                        connect(view.id, ConstraintSet.RIGHT, motionLayout.id, ConstraintSet.RIGHT)

                        connect(view.id, ConstraintSet.END, motionLayout.id, ConstraintSet.END)

                        setAlpha(view.id, 1.0F)

                        constrainWidth(

                            view.id,
@@ -210,7 +210,7 @@ private fun ConstraintSet.adjustClosedConstraintsForDrawer( 
                        )

                        setMargin(

                            view.id,

                            ConstraintSet.RIGHT,

                            ConstraintSet.END,

                            motionLayout.context.resources.getDimensionPixelSize(

                                R.dimen.volume_dialog_background_margin

                            ),
@@ -264,7 +264,7 @@ private fun ConstraintSet.adjustClosedConstraintsForDrawer( 
                motionLayout.context.resources.getDimensionPixelSize(R.dimen.volume_dialog_width),

            )

            connect(view.id, ConstraintSet.BOTTOM, motionLayout.id, ConstraintSet.BOTTOM)

            connect(view.id, ConstraintSet.RIGHT, motionLayout.id, ConstraintSet.RIGHT)

            connect(view.id, ConstraintSet.END, motionLayout.id, ConstraintSet.END)

            setMargin(

                view.id,

                ConstraintSet.BOTTOM,