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

Commit e4b4923d authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Fix slice card layout so show more button works correctly"

parents 303fd8cc 2fa9b7b6

res/layout/homepage_slice_tile.xml

+3 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


<androidx.cardview.widget.CardView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    style="@style/ContextualCardStyle">
@@ -26,9 +25,9 @@ 
        android:id="@+id/slice_view"

        android:layout_width="match_parent"

        android:layout_height="@dimen/homepage_slice_card_max_height"

        android:layout_marginBottom="@dimen/homepage_card_bottom_margin"

        android:layout_marginTop="@dimen/homepage_card_top_margin"

        android:paddingStart="@dimen/homepage_card_padding_start"

        android:paddingEnd="@dimen/homepage_card_padding_end"

        android:paddingTop="@dimen/homepage_card_padding_top"

        android:paddingBottom="@dimen/homepage_card_padding_bottom"/>

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



</androidx.cardview.widget.CardView>

res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -336,8 +336,8 @@ 
    <dimen name="homepage_card_padding_bottom">6dp</dimen>



    <!-- Slice cards maximum height (4 rows + show more)

        MODE_LARGE height(3 rows + show more) 240dp + one line text(1 row) 48dp = 288dp -->

    <dimen name="homepage_slice_card_max_height">288dp</dimen>

        MODE_LARGE height(3 rows + show more) 240dp + two lines text(1 row) 60dp = 300dp -->

    <dimen name="homepage_slice_card_max_height">300dp</dimen>



    <!-- Signal icon in NetworkSelectSetting -->

    <dimen name="signal_strength_icon_size">24dp</dimen>