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

Commit b2639ad1 authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge "Fix the ripple effect of homepage slice cards"

parents dcf4dcae 57384c44
Loading
Loading
Loading
Loading
+10 −18
Original line number Diff line number Diff line
@@ -483,13 +483,6 @@
    </style>

    <style name="SliceViewStyle">
        <!-- 2dp start padding for the start icon -->
        <item name="android:paddingStart">2dp</item>

        <!-- End margin of content without end items is 24dp.
             android:paddingEnd = 24 - 16(contentEndPadding) -->
        <item name="android:paddingEnd">8dp</item>

        <item name="rowStyle">@style/SliceRowStyle</item>
        <item name="android:background">?android:attr/colorBackgroundFloating</item>
    </style>
@@ -499,29 +492,28 @@
    </style>

    <style name="SliceRowStyle">
        <!-- 2dp start padding for the start icon -->
        <item name="titleItemStartPadding">2dp</item>
        <item name="titleItemEndPadding">0dp</item>

        <!-- Padding between content and the start icon is 14dp. -->
        <!-- Padding between content and the start icon is 14dp -->
        <item name="contentStartPadding">14dp</item>
        <!-- Padding between content and end items is 16dp. -->
        <!-- Padding between content and end items is 16dp -->
        <item name="contentEndPadding">16dp</item>

        <!-- Both side margins of end item are 16dp.
             endItemEndPadding = 16 - 8(android:paddingEnd) -->
        <!-- Both side margins of end item are 16dp -->
        <item name="endItemStartPadding">16dp</item>
        <item name="endItemEndPadding">8dp</item>
        <item name="endItemEndPadding">16dp</item>

        <!-- Both side margins of bottom divider are 12dp.
             bottomDividerStartPadding = 12 - 2(android:paddingStart)
             bottomDividerEndPadding = 12 - 8(android:paddingEnd) -->
        <item name="bottomDividerStartPadding">10dp</item>
        <item name="bottomDividerEndPadding">4dp</item>
        <!-- Both side margins of bottom divider are 12dp -->
        <item name="bottomDividerStartPadding">12dp</item>
        <item name="bottomDividerEndPadding">12dp</item>

        <item name="actionDividerHeight">32dp</item>
    </style>

    <style name="SliceRowStyle.Settings">
        <!-- Padding between content and the start icon is 8dp. -->
        <!-- Padding between content and the start icon is 8dp -->
        <item name="contentStartPadding">8dp</item>
    </style>