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

Commit 8538778d authored by Yanting Yang's avatar Yanting Yang Committed by Android (Google) Code Review
Browse files

Merge "Modify margin for overall contextual settings home screen"

parents dd059cb7 87cd0f9d

res/layout/homepage_slice_tile.xml

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
            android:id="@+id/slice_view"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginBottom="@dimen/homepage_card_vertical_margin"

            android:layout_marginTop="@dimen/homepage_card_vertical_margin"

            android:paddingStart="@dimen/homepage_card_padding_start"

            android:paddingEnd="@dimen/homepage_card_padding_end"/>

res/layout/settings_homepage_container.xml

+3 −1
Original line number Diff line number Diff line
@@ -42,7 +42,9 @@ 
            <FrameLayout

                android:id="@+id/contextual_cards_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"/>

                android:layout_height="wrap_content"

                android:layout_marginStart="@dimen/homepage_card_side_margin"

                android:layout_marginEnd="@dimen/homepage_card_side_margin"/>



            <FrameLayout

                android:id="@+id/main_content"

res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -329,8 +329,8 @@ 
    <dimen name="homepage_card_icon_size">24dp</dimen>

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

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

    <dimen name="homepage_card_vertical_margin">4dp</dimen>

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

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

    <dimen name="homepage_card_side_margin">4dp</dimen>

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

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

res/values/styles.xml

+0 −1
Original line number Diff line number Diff line
@@ -482,7 +482,6 @@ 
    </style>



    <style name="ContextualCardStyle">

        <item name="android:layout_marginTop">@dimen/homepage_card_vertical_margin</item>

        <item name="android:layout_marginBottom">@dimen/homepage_card_vertical_margin</item>

        <item name="android:layout_marginStart">@dimen/homepage_card_side_margin</item>

        <item name="android:layout_marginEnd">@dimen/homepage_card_side_margin</item>