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

Commit 702680e4 authored by Arian's avatar Arian Committed by Bruno Martins
Browse files

VolumeDialog: Set the gravity and rotation based on the panels location 



Change-Id: Id59378ef9b980908d9bb05369f131deb27d3bb28
Signed-off-by: default avatarJesse Chan <jc@lineageos.org>
parent d529cfe0

packages/SystemUI/res/layout-land/volume_dialog.xml

+2 −10
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ 
            android:layout_width="@dimen/volume_dialog_ringer_size"

            android:layout_height="@dimen/volume_dialog_ringer_size"

            android:layout_marginBottom="@dimen/volume_dialog_spacer"

            android:gravity="right"

            android:layout_gravity="right"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:clipToPadding="false"

            android:background="@drawable/rounded_bg_full">
@@ -73,8 +71,6 @@ 
            android:minWidth="@dimen/volume_dialog_panel_width"

            android:layout_height="wrap_content"

            android:layout_marginTop="68dp"

            android:gravity="right"

            android:layout_gravity="right"

            android:orientation="vertical"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:clipChildren="false"
@@ -103,7 +99,6 @@ 
                    android:layout_height="@dimen/volume_dialog_tap_target_size"

                    android:layout_marginRight="8dp"

                    android:layout_marginLeft="8dp"

                    android:layout_gravity="right"

                    android:contentDescription="@string/accessibility_volume_settings"

                    android:background="@drawable/ripple_drawable_20dp"

                    android:tint="?android:attr/textColorSecondary"
@@ -120,13 +115,11 @@ 
                    android:layout_height="@dimen/volume_dialog_tap_target_size"

                    android:layout_marginRight="8dp"

                    android:layout_marginLeft="8dp"

                    android:layout_gravity="right"

                    android:contentDescription="@string/accessibility_volume_expand"

                    android:background="@drawable/ripple_drawable_20dp"

                    android:tint="?android:attr/textColorSecondary"

                    android:soundEffectsEnabled="false"

                    android:padding="14dp"

                    android:rotation="90" />

                    android:padding="14dp" />

            </FrameLayout>

        </LinearLayout>
@@ -134,9 +127,8 @@ 
            android:id="@+id/odi_captions"

            android:layout_width="@dimen/volume_dialog_caption_size"

            android:layout_height="@dimen/volume_dialog_caption_size"

            android:layout_marginLeft="68dp"

            android:layout_marginRight="68dp"

            android:gravity="right"

            android:layout_gravity="right"

            android:clipToPadding="false"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:background="@drawable/rounded_bg_full">

packages/SystemUI/res/layout/volume_dialog.xml

+1 −10
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ 
            android:layout_width="@dimen/volume_dialog_ringer_size"

            android:layout_height="@dimen/volume_dialog_ringer_size"

            android:layout_marginBottom="@dimen/volume_dialog_spacer"

            android:gravity="right"

            android:layout_gravity="right"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:clipToPadding="false"

            android:background="@drawable/rounded_bg_full">
@@ -74,8 +72,6 @@ 
            android:minWidth="@dimen/volume_dialog_panel_width"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="right"

            android:layout_gravity="right"

            android:orientation="vertical"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:clipChildren="false"
@@ -104,7 +100,6 @@ 
                    android:layout_height="@dimen/volume_dialog_tap_target_size"

                    android:layout_marginRight="8dp"

                    android:layout_marginLeft="8dp"

                    android:layout_gravity="right"

                    android:contentDescription="@string/accessibility_volume_settings"

                    android:background="@drawable/ripple_drawable_20dp"

                    android:tint="?android:attr/textColorSecondary"
@@ -121,13 +116,11 @@ 
                    android:layout_height="@dimen/volume_dialog_tap_target_size"

                    android:layout_marginRight="8dp"

                    android:layout_marginLeft="8dp"

                    android:layout_gravity="right"

                    android:contentDescription="@string/accessibility_volume_expand"

                    android:background="@drawable/ripple_drawable_20dp"

                    android:tint="?android:attr/textColorSecondary"

                    android:soundEffectsEnabled="false"

                    android:padding="14dp"

                    android:rotation="90" />

                    android:padding="14dp" />

            </FrameLayout>

        </LinearLayout>
@@ -136,8 +129,6 @@ 
            android:layout_width="@dimen/volume_dialog_caption_size"

            android:layout_height="@dimen/volume_dialog_caption_size"

            android:layout_marginTop="@dimen/volume_dialog_spacer"

            android:gravity="right"

            android:layout_gravity="right"

            android:clipToPadding="false"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:background="@drawable/rounded_bg_full">

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+14 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ public class VolumeDialogImpl implements VolumeDialog, 


    private View mDialog;

    private ViewGroup mDialogView;

    private ViewGroup mDialogMainView;

    private ViewGroup mDialogRowsView;

    private ViewGroup mRinger;

    private ImageButton mRingerIcon;
@@ -278,6 +279,11 @@ public class VolumeDialogImpl implements VolumeDialog, 
        dialogViewLP.gravity = Gravity.CENTER_VERTICAL;

        mDialogView.setLayoutParams(dialogViewLP);



        mDialogMainView = mDialog.findViewById(R.id.main);

        if (mDialogMainView != null) {

            setLayoutGravity(mDialogMainView.getLayoutParams(), panelGravity);

        }



        mDialogRowsView = mDialog.findViewById(R.id.volume_dialog_rows);

        mRinger = mDialog.findViewById(R.id.ringer);

        if (mRinger != null) {
@@ -291,6 +297,7 @@ public class VolumeDialogImpl implements VolumeDialog, 
        mODICaptionsView = mDialog.findViewById(R.id.odi_captions);

        if (mODICaptionsView != null) {

            mODICaptionsIcon = mODICaptionsView.findViewById(R.id.odi_captions_icon);

            setLayoutGravity(mODICaptionsView.getLayoutParams(), panelGravity);

        }

        mODICaptionsTooltipViewStub = mDialog.findViewById(R.id.odi_captions_tooltip_stub);

        if (mHasSeenODICaptionsTooltip && mODICaptionsTooltipViewStub != null) {
@@ -300,9 +307,16 @@ public class VolumeDialogImpl implements VolumeDialog, 


        mMediaOutputView = mDialog.findViewById(R.id.media_output_container);

        mMediaOutputIcon = mDialog.findViewById(R.id.media_output);

        if (mMediaOutputIcon != null) {

            setLayoutGravity(mMediaOutputIcon.getLayoutParams(), panelGravity);

        }



        mExpandRowsView = mDialog.findViewById(R.id.expandable_indicator_container);

        mExpandRows = mDialog.findViewById(R.id.expandable_indicator);

        if (mExpandRows != null) {

            setLayoutGravity(mExpandRows.getLayoutParams(), panelGravity);

            mExpandRows.setRotation(mVolumePanelOnLeft ? -90 : 90);

        }



        if (mRows.isEmpty()) {

            if (!AudioSystem.isSingleVolume(mContext)) {