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

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

Merge "Make AlertDialog use specific styles per button" into sc-v2-dev

parents 869e9dd7 6f78e3c1

core/res/res/layout/alert_dialog.xml

+3 −3
Original line number Diff line number Diff line
@@ -124,21 +124,21 @@ 
                android:layout_width="0dip"

                android:layout_gravity="start"

                android:layout_weight="1"

                style="?android:attr/buttonBarButtonStyle"

                style="?android:attr/buttonBarPositiveButtonStyle"

                android:maxLines="2"

                android:layout_height="wrap_content" />

            <Button android:id="@+id/button3"

                android:layout_width="0dip"

                android:layout_gravity="center_horizontal"

                android:layout_weight="1"

                style="?android:attr/buttonBarButtonStyle"

                style="?android:attr/buttonBarNeutralButtonStyle"

                android:maxLines="2"

                android:layout_height="wrap_content" />

            <Button android:id="@+id/button2"

                android:layout_width="0dip"

                android:layout_gravity="end"

                android:layout_weight="1"

                style="?android:attr/buttonBarButtonStyle"

                style="?android:attr/buttonBarNegativeButtonStyle"

                android:maxLines="2"

                android:layout_height="wrap_content" />

            <LinearLayout android:id="@+id/rightSpacer"

packages/SystemUI/res/values/styles.xml

+3 −0
Original line number Diff line number Diff line
@@ -419,6 +419,9 @@ 


    <style name="Theme.SystemUI.Dialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog">

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

        <item name="android:buttonBarPositiveButtonStyle">@style/Widget.QSDialog.Button</item>

        <item name="android:buttonBarNegativeButtonStyle">@style/Widget.QSDialog.Button.BorderButton</item>

        <item name="android:buttonBarNeutralButtonStyle">@style/Widget.QSDialog.Button.BorderButton</item>

    </style>



    <style name="Theme.SystemUI.Dialog.Alert" parent="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" />