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

Commit a22be8fb authored by Ram Parameswaran's avatar Ram Parameswaran Committed by Android (Google) Code Review
Browse files

Merge "Update dialog styling to comply with design guidelines" into sc-v2-dev

parents 8dbc9003 45462a81

core/res/res/layout-car/car_alert_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
                    android:layout_height="wrap_content"

                    android:layout_marginStart="@dimen/text_view_start_margin"

                    android:layout_marginEnd="@dimen/text_view_end_margin"

                    style="@style/CarBody2"/>

                    style="@style/CarBody4"/>



                <!-- we don't need this spacer, but the id needs to be here for compatibility -->

                <Space

core/res/res/layout-car/car_alert_dialog_button_bar.xml

+9 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ 
        <Button

            android:id="@+id/button3"

            style="@style/CarAction1"

            android:minWidth="@dimen/car_touch_target_size"

            android:paddingStart="@dimen/car_padding_2"

            android:paddingEnd="@dimen/car_padding_2"

            android:background="@drawable/car_dialog_button_background"

            android:layout_marginRight="@dimen/button_end_margin"

            android:layout_width="wrap_content"
@@ -44,6 +47,9 @@ 
        <Button

            android:id="@+id/button2"

            style="@style/CarAction1"

            android:minWidth="@dimen/car_touch_target_size"

            android:paddingStart="@dimen/car_padding_2"

            android:paddingEnd="@dimen/car_padding_2"

            android:background="@drawable/car_dialog_button_background"

            android:layout_marginRight="@dimen/button_end_margin"

            android:layout_width="wrap_content"
@@ -52,6 +58,9 @@ 
        <Button

            android:id="@+id/button1"

            style="@style/CarAction1"

            android:minWidth="@dimen/car_touch_target_size"

            android:paddingStart="@dimen/car_padding_2"

            android:paddingEnd="@dimen/car_padding_2"

            android:background="@drawable/car_dialog_button_background"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/button_layout_height" />

core/res/res/values/dimens_car.xml

+3 −3
Original line number Diff line number Diff line
@@ -110,10 +110,10 @@ 
    <dimen name="car_textview_fading_edge_length">40dp</dimen>



    <!-- Dialog start padding for button bar layout -->

    <dimen name="button_bar_layout_start_padding">@*android:dimen/car_keyline_1</dimen>

    <dimen name="button_bar_layout_start_padding">@dimen/car_padding_2</dimen>



    <!-- Dialog end padding for button bar layout -->

    <dimen name="button_bar_layout_end_padding">@*android:dimen/car_keyline_1</dimen>

    <dimen name="button_bar_layout_end_padding">@dimen/car_padding_2</dimen>



    <!-- Dialog top padding for button bar layout -->

    <dimen name="button_bar_layout_top_padding">@*android:dimen/car_padding_2</dimen>
@@ -122,7 +122,7 @@ 
    <dimen name="button_layout_height">@*android:dimen/car_card_action_bar_height</dimen>



    <!-- Dialog button end margin -->

    <dimen name="button_end_margin">@*android:dimen/car_padding_4</dimen>

    <dimen name="button_end_margin">@*android:dimen/car_padding_2</dimen>



    <!-- Dialog top padding when there is no title -->

    <dimen name="dialog_no_title_padding_top">@*android:dimen/car_padding_4</dimen>