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

Commit aaeacb80 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Match rounded corners in QSDetail and QSFooter" into sc-dev

parents 42cef834 cac316e6

packages/SystemUI/res/drawable/qs_detail_background.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Copyright (C) 2014 The Android Open Source Project 
        <inset>

            <shape>

                <solid android:color="@color/qs_detail_transition"/>

                <corners android:radius="?android:attr/dialogCornerRadius" />

                <corners android:radius="@dimen/qs_footer_action_corner_radius" />

            </shape>

        </inset>

    </item>
@@ -26,7 +26,7 @@ Copyright (C) 2014 The Android Open Source Project 
        <inset>

            <shape>

                <solid android:color="?android:attr/colorBackgroundFloating"/>

                <corners android:radius="?android:attr/dialogCornerRadius" />

                <corners android:radius="@dimen/qs_footer_action_corner_radius" />

            </shape>

        </inset>

    </item>

packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ 
        <item android:id="@android:id/mask">

            <shape android:shape="rectangle">

                <solid android:color="@android:color/white"/>

                <corners android:radius="@dimen/screenshot_button_corner_radius"/>

                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>

            </shape>

        </item>

        <item>

            <shape android:shape="rectangle">

            <stroke android:width="1dp" android:color="@color/qs_footer_action_border"/>

                <solid android:color="@android:color/transparent"/>

                <corners android:radius="@dimen/screenshot_button_corner_radius"/>

                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>

            </shape>

        </item>

    </ripple>

packages/SystemUI/res/drawable/qs_footer_action_chip_background_borderless.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 
        <item android:id="@android:id/mask">

            <shape android:shape="rectangle">

                <solid android:color="@android:color/white"/>

                <corners android:radius="@dimen/screenshot_button_corner_radius"/>

                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>

            </shape>

        </item>

        <item>

            <shape android:shape="rectangle">

                <solid android:color="@android:color/transparent"/>

                <corners android:radius="@dimen/screenshot_button_corner_radius"/>

                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>

            </shape>

        </item>

    </ripple>

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -412,6 +412,8 @@ 
    <!-- The size of each of the icon buttons in the QS footer -->

    <dimen name="qs_footer_action_button_size">@dimen/qs_footer_height</dimen>



    <dimen name="qs_footer_action_corner_radius">20dp</dimen>



    <!-- (48dp - 44dp) / 2 -->

    <dimen name="qs_footer_action_inset">2dp</dimen>