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

Commit b3a5cbf5 authored by Aran Ink's avatar Aran Ink Committed by android-build-merger
Browse files

Merge "Fix shadow and animation clipping for Global Actions Dialog." into qt-dev 

am: c543db04

Change-Id: I0757d4f94042fa8d42b2b5b3dc1bc2beb8c6d3be
parents f9526e03 c543db04

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

+5 −3
Original line number Diff line number Diff line
@@ -5,19 +5,21 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal"

    android:clipToPadding="false"

    android:theme="@style/qs_theme"

    android:paddingLeft="@dimen/global_actions_top_padding"

    android:gravity="right"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingRight="@dimen/global_actions_grid_container_shadow_offset"

    android:layout_marginRight="@dimen/global_actions_grid_container_negative_shadow_offset"

>

    <LinearLayout

        android:layout_height="match_parent"

        android:layout_width="wrap_content"

        android:gravity="top|right"

        android:padding="0dp"

        android:orientation="vertical"

        android:layout_marginRight="@dimen/global_actions_grid_container_bottom_margin"

        android:clipChildren="false"

        android:clipToPadding="false"

    >

        <!-- Grid of action items -->

        <com.android.systemui.globalactions.ListGridLayout

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

+5 −2
Original line number Diff line number Diff line
@@ -5,11 +5,12 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal"

    android:clipToPadding="false"

    android:theme="@style/qs_theme"

    android:gravity="left"

    android:paddingRight="@dimen/global_actions_top_padding"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingLeft="@dimen/global_actions_grid_container_shadow_offset"

    android:layout_marginLeft="@dimen/global_actions_grid_container_negative_shadow_offset"

>

    <LinearLayout

        android:layout_height="match_parent"
@@ -17,6 +18,8 @@ 
        android:gravity="bottom|left"

        android:padding="0dp"

        android:orientation="vertical"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:layout_marginLeft="@dimen/global_actions_grid_container_bottom_margin"

    >

        <!-- For separated items-->

packages/SystemUI/res/layout/global_actions_grid.xml

+5 −2
Original line number Diff line number Diff line
@@ -5,17 +5,20 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal"

    android:clipToPadding="false"

    android:theme="@style/qs_theme"

    android:gravity="bottom"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingBottom="@dimen/global_actions_grid_container_shadow_offset"

    android:layout_marginBottom="@dimen/global_actions_grid_container_negative_shadow_offset"

>

    <LinearLayout

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:gravity="bottom | right"

        android:padding="0dp"

        android:layoutDirection="ltr"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:layout_marginBottom="@dimen/global_actions_grid_container_bottom_margin"

    >

        <!-- For separated items-->

packages/SystemUI/res/values-sw320dp/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
  -->

<resources>

    <!-- Global actions grid -->

    <dimen name="global_actions_grid_container_bottom_margin">4dp</dimen>



    <dimen name="global_actions_grid_vertical_padding">0dp</dimen>

    <dimen name="global_actions_grid_horizontal_padding">3dp</dimen>

packages/SystemUI/res/values-sw392dp/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
  -->

<resources>

    <!-- Global actions grid -->

    <dimen name="global_actions_grid_container_bottom_margin">4dp</dimen>



    <dimen name="global_actions_grid_vertical_padding">0dp</dimen>

    <dimen name="global_actions_grid_horizontal_padding">3dp</dimen>