PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fan Zhang
2018-11-01 19:14:40 +00:00
committed by Android (Google) Code Review
parent 303fd8cc1a 2fa9b7b652
commit e4b4923dd0
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/homepage_slice_tile.xml
View File

@@ -17,7 +17,6 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/ContextualCardStyle"> style="@style/ContextualCardStyle">
@@ -26,9 +25,9 @@
android:id="@+id/slice_view" android:id="@+id/slice_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/homepage_slice_card_max_height" 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:paddingStart="@dimen/homepage_card_padding_start"
android:paddingEnd="@dimen/homepage_card_padding_end" android:paddingEnd="@dimen/homepage_card_padding_end"/>
android:paddingTop="@dimen/homepage_card_padding_top"
android:paddingBottom="@dimen/homepage_card_padding_bottom"/>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>

4
res/values/dimens.xml
View File

@@ -336,8 +336,8 @@
<dimen name="homepage_card_padding_bottom">6dp</dimen> <dimen name="homepage_card_padding_bottom">6dp</dimen>
<!-- Slice cards maximum height (4 rows + show more) <!-- Slice cards maximum height (4 rows + show more)
MODE_LARGE height(3 rows + show more) 240dp + one line text(1 row) 48dp = 288dp --> MODE_LARGE height(3 rows + show more) 240dp + two lines text(1 row) 60dp = 300dp -->
<dimen name="homepage_slice_card_max_height">288dp</dimen> <dimen name="homepage_slice_card_max_height">300dp</dimen>
<!-- Signal icon in NetworkSelectSetting --> <!-- Signal icon in NetworkSelectSetting -->
<dimen name="signal_strength_icon_size">24dp</dimen> <dimen name="signal_strength_icon_size">24dp</dimen>