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

Commit 81891aad authored by Tetiana Meronyk's avatar Tetiana Meronyk Committed by Android (Google) Code Review
Browse files

Merge "Make corners rounded in dialog_with_icon.xml" into udc-qpr-dev

parents 5dc4f71d 80f0521c

packages/SettingsLib/res/drawable/dialog_btn_filled.xml

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

            <shape android:shape="rectangle">

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

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

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

            </shape>

        </item>

        <item>

            <shape android:shape="rectangle">

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

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

                <solid android:color="?androidprv:attr/colorAccentPrimary"/>

                <padding android:left="@dimen/dialog_button_horizontal_padding"

                         android:top="@dimen/dialog_button_vertical_padding"

packages/SettingsLib/res/drawable/dialog_btn_outline.xml

+3 −4
Original line number Diff line number Diff line
@@ -22,16 +22,15 @@ 
        <item android:id="@android:id/mask">

            <shape android:shape="rectangle">

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

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

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

            </shape>

        </item>

        <item>

            <shape android:shape="rectangle">

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

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

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

                <stroke android:color="?androidprv:attr/colorAccentPrimaryVariant"

                        android:width="1dp"

                />

                        android:width="1dp"/>

                <padding android:left="@dimen/dialog_button_horizontal_padding"

                         android:top="@dimen/dialog_button_vertical_padding"

                         android:right="@dimen/dialog_button_horizontal_padding"

packages/SettingsLib/res/layout/dialog_with_icon.xml

+1 −4
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 
                android:id="@+id/button_cancel"

                style="@style/DialogButtonNegative"

                android:layout_width="wrap_content"

                android:buttonCornerRadius="28dp"

                android:layout_height="wrap_content"

                android:visibility="gone"/>
@@ -78,7 +77,6 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                style="@style/DialogButtonNegative"

                android:buttonCornerRadius="40dp"

                android:visibility="gone"/>



            <Space
@@ -92,8 +90,7 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                style="@style/DialogButtonPositive"

                android:visibility="gone"

            />

                android:visibility="gone"/>

        </LinearLayout>

    </LinearLayout>

</ScrollView>

packages/SettingsLib/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -124,4 +124,5 @@ 
    <dimen name="dialog_bottom_padding">18dp</dimen>

    <dimen name="dialog_side_padding">24dp</dimen>

    <dimen name="dialog_button_bar_top_padding">32dp</dimen>

    <dimen name="button_corner_radius">28dp</dimen>

</resources>

packages/SettingsLib/res/values/styles.xml

+0 −2
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ 
    </style>



    <style name="DialogButtonPositive">

        <item name="android:buttonCornerRadius">0dp</item>

        <item name="android:background">@drawable/dialog_btn_filled</item>

        <item name="android:textColor">?androidprv:attr/textColorOnAccent</item>

        <item name="android:textSize">14sp</item>
@@ -104,7 +103,6 @@ 
    </style>



    <style name="DialogButtonNegative">

        <item name="android:buttonCornerRadius">28dp</item>

        <item name="android:background">@drawable/dialog_btn_outline</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textSize">14sp</item>