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

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

Merge "Adjust contextual card dismissal view"

parents 9b6005e5 2ef995b7
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_marginBottom="@dimen/homepage_card_dismissal_margin_bottom"
        android:gravity="bottom|end">

        <Button
@@ -49,8 +48,8 @@
            style="@style/ContextualCardDismissalButton"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginStart="@dimen/homepage_card_dismissal_button_side_margin"
            android:layout_marginEnd="@dimen/homepage_card_dismissal_button_side_margin"
            android:layout_marginStart="@dimen/homepage_card_dismissal_button_margin_start"
            android:layout_marginEnd="@dimen/homepage_card_dismissal_button_margin_end"
            android:text="@string/contextual_card_dismiss_keep"/>

    </LinearLayout>
+3 −3
Original line number Diff line number Diff line
@@ -335,10 +335,10 @@
    <dimen name="homepage_half_card_title_margin_top">12dp</dimen>

    <!-- Homepage dismissal cards size and padding -->
    <dimen name="homepage_card_dismissal_margin_top">16dp</dimen>
    <dimen name="homepage_card_dismissal_margin_bottom">2dp</dimen>
    <dimen name="homepage_card_dismissal_margin_top">12dp</dimen>
    <dimen name="homepage_card_dismissal_side_margin">16dp</dimen>
    <dimen name="homepage_card_dismissal_button_side_margin">6dp</dimen>
    <dimen name="homepage_card_dismissal_button_margin_start">4dp</dimen>
    <dimen name="homepage_card_dismissal_button_margin_end">6dp</dimen>

    <!-- Horizontal divider size and margin -->
    <dimen name="horizontal_divider_margin_top">4dp</dimen>
+1 −2
Original line number Diff line number Diff line
@@ -460,8 +460,7 @@

    <style name="ContextualCardDismissalButton"
           parent="android:Widget.DeviceDefault.Button.Borderless.Colored">
        <item name="android:minWidth">10dp</item>
        <item name="android:minHeight">16dp</item>
        <item name="android:minWidth">24dp</item>
        <item name="android:textAllCaps">false</item>
    </style>