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

Commit f52a9954 authored by Aaron Heuckroth's avatar Aaron Heuckroth Committed by android-build-merger
Browse files

Merge "Expand emergency button to match size of container when only item in... 

Merge "Expand emergency button to match size of container when only item in separated list." into qt-dev
am: 0801c16f

Change-Id: I072152e2c274849edb42b179bb59ef0005300ff7
parents 7dd2575b 0801c16f

packages/SystemUI/res/layout/global_actions_grid_item.xml

+39 −33
Original line number Diff line number Diff line
@@ -20,12 +20,17 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="@dimen/global_actions_grid_item_width"

    android:layout_height="@dimen/global_actions_grid_item_height"

    android:gravity="top|center_horizontal"

    android:orientation="vertical"

    android:gravity="center"

    android:layout_marginTop="@dimen/global_actions_grid_item_vertical_margin"

    android:layout_marginBottom="@dimen/global_actions_grid_item_vertical_margin"

    android:layout_marginLeft="@dimen/global_actions_grid_item_side_margin"

    android:layout_marginRight="@dimen/global_actions_grid_item_side_margin"

>

    <LinearLayout

        android:layout_width="@dimen/global_actions_grid_item_width"

        android:layout_height="@dimen/global_actions_grid_item_height"

        android:gravity="top|center_horizontal"

        android:orientation="vertical"

    >

        <ImageView

            android:id="@*android:id/icon"
@@ -61,3 +66,4 @@ 
            android:textAppearance="?android:attr/textAppearanceSmall"

        />

    </LinearLayout>

</LinearLayout>

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsGridLayout.java

+11 −0
Original line number Diff line number Diff line
@@ -119,6 +119,17 @@ public class GlobalActionsGridLayout extends MultiListLayout { 
            }

        }

        updateSnapPosition();

        updateSeparatedButtonSize();

    }



    private void updateSeparatedButtonSize() {

        ViewGroup separated = getSeparatedView();

        if (separated.getChildCount() == 1) {

            View onlyChild = separated.getChildAt(0);

            ViewGroup.LayoutParams childParams = onlyChild.getLayoutParams();

            childParams.width = ViewGroup.LayoutParams.MATCH_PARENT;

            childParams.height = ViewGroup.LayoutParams.MATCH_PARENT;

        }

    }



    @Override