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

Commit 82222488 authored by Sean Liu's avatar Sean Liu Committed by Android (Google) Code Review
Browse files

Merge "Modifying layout for expanding entry card" into nyc-dev

parents afe9aed2 3a580ba0

res/layout/expanding_entry_card_item.xml

+6 −6
Original line number Diff line number Diff line
@@ -96,10 +96,9 @@ 
         android:visibility="gone"

         android:background="?android:attr/selectableItemBackgroundBorderless"

         android:paddingTop="@dimen/expanding_entry_card_item_icon_margin_top"

         android:paddingBottom="@dimen/expanding_entry_card_item_alternate_icon_margin_bottom"

         android:paddingLeft="@dimen/expanding_entry_card_item_alternate_icon_margin_left"

         android:paddingRight="@dimen/expanding_entry_card_item_alternate_icon_margin_right"

         android:layout_marginStart="@dimen/expanding_entry_card_item_alternate_icon_start_margin" />

         android:paddingBottom="@dimen/expanding_entry_card_item_icon_margin_bottom"

         android:paddingLeft="@dimen/expanding_entry_card_item_icon_margin_left"

         android:paddingRight="@dimen/expanding_entry_card_item_icon_margin_right"/>



     <ImageView

         android:id="@+id/icon_alternate"
@@ -110,6 +109,7 @@ 
         android:visibility="gone"

         android:background="?android:attr/selectableItemBackgroundBorderless"

         android:paddingTop="@dimen/expanding_entry_card_item_icon_margin_top"

         android:paddingBottom="@dimen/expanding_entry_card_item_alternate_icon_margin_bottom"

         android:layout_marginStart="@dimen/expanding_entry_card_item_alternate_icon_start_margin" />

         android:paddingBottom="@dimen/expanding_entry_card_item_icon_margin_bottom"

         android:paddingLeft="@dimen/expanding_entry_card_item_icon_margin_left"

         android:paddingRight="@dimen/expanding_entry_card_item_icon_margin_right"/>

</view>

res/values/dimens.xml

+4 −5
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ 


    <!-- Dimensions for an entry in ExpandingEntryCardView -->

    <dimen name="expanding_entry_card_item_padding_start">20dp</dimen>

    <dimen name="expanding_entry_card_item_padding_end">20dp</dimen>

    <dimen name="expanding_entry_card_item_padding_end">8dp</dimen>

    <dimen name="expanding_entry_card_item_padding_top">13dp</dimen>

    <dimen name="expanding_entry_card_item_padding_bottom">16dp</dimen>

    <dimen name="expanding_entry_card_item_image_spacing">27dp</dimen>
@@ -226,11 +226,10 @@ 
    <dimen name="expanding_entry_card_item_sub_header_icon_margin_bottom">14dp</dimen>



    <dimen name="expanding_entry_card_item_icon_margin_top">12dp</dimen>

    <dimen name="expanding_entry_card_item_icon_margin_bottom">12dp</dimen>

    <dimen name="expanding_entry_card_item_icon_margin_left">12dp</dimen>

    <dimen name="expanding_entry_card_item_icon_margin_right">12dp</dimen>

    <dimen name="expanding_entry_card_item_header_only_margin_top">6dp</dimen>

    <dimen name="expanding_entry_card_item_alternate_icon_start_margin">16dp</dimen>

    <dimen name="expanding_entry_card_item_alternate_icon_margin_bottom">12dp</dimen>

    <dimen name="expanding_entry_card_item_alternate_icon_margin_left">12dp</dimen>

    <dimen name="expanding_entry_card_item_alternate_icon_margin_right">12dp</dimen>



    <dimen name="expanding_entry_card_badge_separator_margin">8dp</dimen>

    <dimen name="expanding_entry_card_card_corner_radius">2dp</dimen>