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

Unverified Commit b1a8b166 authored by Arian's avatar Arian Committed by Michael Bestas
Browse files

VolumeDialogImpl: Drop unnecessary layout gravity defines and handle left 

These layouts are already in layouts which set gravity to the same value, making the layout gravity set here redundant.
Additionally, invert the gravities when the gravitiy is set to left by R.integer.volume_dialog_gravity.

Change-Id: Ia989ab507512443949b3a7994166d56f97dde9df
parent 0b642065

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

+1 −6
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ 
    android:layout_width="wrap_content"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:gravity="right"

    android:gravity="right"

    android:layout_gravity="right"

    android:background="@android:color/transparent"

    android:background="@android:color/transparent"

    android:theme="@style/volume_dialog_theme">

    android:theme="@style/volume_dialog_theme">
@@ -31,7 +30,6 @@ 
        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="right"

        android:gravity="right"

        android:layout_gravity="right"

        android:layout_marginRight="@dimen/volume_dialog_panel_transparent_padding_right"

        android:layout_marginRight="@dimen/volume_dialog_panel_transparent_padding_right"

        android:orientation="vertical"

        android:orientation="vertical"

        android:clipToPadding="false"

        android:clipToPadding="false"
@@ -55,7 +53,6 @@ 
                android:layout_height="@dimen/volume_dialog_ringer_size"

                android:layout_height="@dimen/volume_dialog_ringer_size"

                android:layout_marginBottom="@dimen/volume_dialog_spacer"

                android:layout_marginBottom="@dimen/volume_dialog_spacer"

                android:gravity="right"

                android:gravity="right"

                android:layout_gravity="right"

                android:translationZ="@dimen/volume_dialog_elevation"

                android:translationZ="@dimen/volume_dialog_elevation"

                android:clipToPadding="false"

                android:clipToPadding="false"

                android:background="@drawable/rounded_bg_full">

                android:background="@drawable/rounded_bg_full">
@@ -83,7 +80,6 @@ 
                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="right"

                android:gravity="right"

                android:layout_gravity="right"

                android:orientation="vertical"

                android:orientation="vertical"

                android:clipChildren="false"

                android:clipChildren="false"

                android:clipToPadding="false" >

                android:clipToPadding="false" >
@@ -136,7 +132,6 @@ 
            android:layout_height="@dimen/volume_dialog_caption_size"

            android:layout_height="@dimen/volume_dialog_caption_size"

            android:layout_marginTop="@dimen/volume_dialog_row_margin_bottom"

            android:layout_marginTop="@dimen/volume_dialog_row_margin_bottom"

            android:gravity="right"

            android:gravity="right"

            android:layout_gravity="right"

            android:clipToPadding="false"

            android:clipToPadding="false"

            android:clipToOutline="true"

            android:clipToOutline="true"

            android:background="@drawable/volume_row_rounded_background">

            android:background="@drawable/volume_row_rounded_background">
@@ -158,7 +153,7 @@ 
        android:layout="@layout/volume_tool_tip_view"

        android:layout="@layout/volume_tool_tip_view"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom | right"

        android:layout_gravity="bottom"

        android:layout_marginRight="@dimen/volume_tool_tip_right_margin"/>

        android:layout_marginRight="@dimen/volume_tool_tip_right_margin"/>





</FrameLayout>
 
</FrameLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/volume_dialog.xml

+1 −6
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ 
    android:layout_width="wrap_content"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:gravity="right"

    android:gravity="right"

    android:layout_gravity="right"

    android:clipToPadding="false"

    android:clipToPadding="false"

    android:theme="@style/volume_dialog_theme">

    android:theme="@style/volume_dialog_theme">
@@ -31,7 +30,6 @@ 
        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="right"

        android:gravity="right"

        android:layout_gravity="right"

        android:layout_marginRight="@dimen/volume_dialog_panel_transparent_padding_right"

        android:layout_marginRight="@dimen/volume_dialog_panel_transparent_padding_right"

        android:orientation="vertical"

        android:orientation="vertical"

        android:clipToPadding="false"

        android:clipToPadding="false"
@@ -54,7 +52,6 @@ 
                android:layout_height="@dimen/volume_dialog_ringer_size"

                android:layout_height="@dimen/volume_dialog_ringer_size"

                android:layout_marginBottom="@dimen/volume_dialog_spacer"

                android:layout_marginBottom="@dimen/volume_dialog_spacer"

                android:gravity="right"

                android:gravity="right"

                android:layout_gravity="right"

                android:translationZ="@dimen/volume_dialog_elevation"

                android:translationZ="@dimen/volume_dialog_elevation"

                android:clipToPadding="false"

                android:clipToPadding="false"

                android:background="@drawable/rounded_bg_full">

                android:background="@drawable/rounded_bg_full">
@@ -82,7 +79,6 @@ 
                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="right"

                android:gravity="right"

                android:layout_gravity="right"

                android:orientation="vertical"

                android:orientation="vertical"

                android:clipChildren="false"

                android:clipChildren="false"

                android:clipToPadding="false" >

                android:clipToPadding="false" >
@@ -135,7 +131,6 @@ 
            android:layout_height="@dimen/volume_dialog_caption_size"

            android:layout_height="@dimen/volume_dialog_caption_size"

            android:layout_marginTop="@dimen/volume_dialog_row_margin_bottom"

            android:layout_marginTop="@dimen/volume_dialog_row_margin_bottom"

            android:gravity="right"

            android:gravity="right"

            android:layout_gravity="right"

            android:clipToPadding="false"

            android:clipToPadding="false"

            android:clipToOutline="true"

            android:clipToOutline="true"

            android:background="@drawable/volume_row_rounded_background">

            android:background="@drawable/volume_row_rounded_background">
@@ -157,7 +152,7 @@ 
        android:layout="@layout/volume_tool_tip_view"

        android:layout="@layout/volume_tool_tip_view"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom | right"

        android:layout_gravity="bottom"

        android:layout_marginRight="@dimen/volume_tool_tip_right_margin"/>

        android:layout_marginRight="@dimen/volume_tool_tip_right_margin"/>





</FrameLayout>
 
</FrameLayout>
 
 No newline at end of file

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

+38 −0
Original line number Original line Diff line number Diff line
@@ -485,6 +485,25 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
                Region.Op.UNION);

                Region.Op.UNION);

    }

    }





    // Helper to set gravity.

    private void setGravity(ViewGroup viewGroup, int gravity) {

        if (viewGroup instanceof LinearLayout) {

            ((LinearLayout) viewGroup).setGravity(gravity);

        }

    }



    // Helper to set layout gravity.

    private void setLayoutGravity(ViewGroup viewGroup, int gravity) {

        if (viewGroup != null) {

            Object obj = viewGroup.getLayoutParams();

            if (obj instanceof FrameLayout.LayoutParams) {

                ((FrameLayout.LayoutParams) obj).gravity = gravity;

            } else if (obj instanceof LinearLayout.LayoutParams) {

                ((LinearLayout.LayoutParams) obj).gravity = gravity;

            }

        }

    }



    private void initDialog(int lockTaskModeState) {

    private void initDialog(int lockTaskModeState) {

        Log.d(TAG, "initDialog: called!");

        Log.d(TAG, "initDialog: called!");

        mDialog = new CustomDialog(mContext);

        mDialog = new CustomDialog(mContext);
@@ -668,6 +687,25 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 




        mRoundedBorderBottom = mDialog.findViewById(R.id.rounded_border_bottom);

        mRoundedBorderBottom = mDialog.findViewById(R.id.rounded_border_bottom);





        if (isWindowGravityLeft()) {

            ViewGroup container = mDialog.findViewById(R.id.volume_dialog_container);

            setGravity(container, Gravity.LEFT);



            setGravity(mDialogView, Gravity.LEFT);



            setGravity((ViewGroup) mTopContainer, Gravity.LEFT);



            setLayoutGravity(mRingerDrawerNewSelectionBg, Gravity.BOTTOM | Gravity.LEFT);



            setLayoutGravity(mSelectedRingerContainer, Gravity.BOTTOM | Gravity.LEFT);



            setGravity(mRinger, Gravity.LEFT);



            setGravity(mDialogRowsViewContainer, Gravity.LEFT);



            setGravity(mODICaptionsView, Gravity.LEFT);

        }



        if (mRows.isEmpty()) {

        if (mRows.isEmpty()) {

            if (!AudioSystem.isSingleVolume(mContext)) {

            if (!AudioSystem.isSingleVolume(mContext)) {

                addRow(STREAM_ACCESSIBILITY, R.drawable.ic_volume_accessibility,

                addRow(STREAM_ACCESSIBILITY, R.drawable.ic_volume_accessibility,