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

Commit 99ac4bdd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Customizable corner radius for dialogs"

parents e442a456 735d8529

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -484,6 +484,7 @@ package android { 
    field public static final int detailSocialSummary = 16843428; // 0x10102a4

    field public static final int detailsElementBackground = 16843598; // 0x101034e

    field public static final int dial = 16843010; // 0x1010102

    field public static final int dialogCornerRadius = 16844145; // 0x1010571

    field public static final int dialogIcon = 16843252; // 0x10101f4

    field public static final int dialogLayout = 16843255; // 0x10101f7

    field public static final int dialogMessage = 16843251; // 0x10101f3

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -617,6 +617,7 @@ package android { 
    field public static final int detailSocialSummary = 16843428; // 0x10102a4

    field public static final int detailsElementBackground = 16843598; // 0x101034e

    field public static final int dial = 16843010; // 0x1010102

    field public static final int dialogCornerRadius = 16844145; // 0x1010571

    field public static final int dialogIcon = 16843252; // 0x10101f4

    field public static final int dialogLayout = 16843255; // 0x10101f7

    field public static final int dialogMessage = 16843251; // 0x10101f3

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -484,6 +484,7 @@ package android { 
    field public static final int detailSocialSummary = 16843428; // 0x10102a4

    field public static final int detailsElementBackground = 16843598; // 0x101034e

    field public static final int dial = 16843010; // 0x1010102

    field public static final int dialogCornerRadius = 16844145; // 0x1010571

    field public static final int dialogIcon = 16843252; // 0x10101f4

    field public static final int dialogLayout = 16843255; // 0x10101f7

    field public static final int dialogMessage = 16843251; // 0x10101f3

core/res/res/drawable/dialog_background_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<inset xmlns:android="http://schemas.android.com/apk/res/android"

    android:inset="16dp">

    <shape android:shape="rectangle">

        <corners android:radius="2dp" />

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

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

    </shape>

</inset>

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -984,6 +984,8 @@ 
        <attr name="dialogTitleDecorLayout" format="reference" />

        <!-- Preferred padding for dialog content. -->

        <attr name="dialogPreferredPadding" format="dimension" />

        <!-- Corner radius of dialogs. -->

        <attr name="dialogCornerRadius" format="dimension" />



        <!-- Theme to use for alert dialogs spawned from this theme. -->

        <attr name="alertDialogTheme" format="reference" />