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

Merge "Use the same layout style for contextual cards"

Browse Source
This commit is contained in:
Raff Tsai
2018-10-17 10:02:40 +00:00
committed by Android (Google) Code Review
parent 1e6455be09 f7bb72c60c
commit cb6b34e893
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/homepage_condition_tile.xml
View File

@@ -17,12 +17,9 @@
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/SuggestionConditionStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardUseCompatPadding="true"
app:cardElevation="@dimen/condition_card_elevation"
app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
style="@style/ContextualCardStyle">
<include layout="@layout/condition_tile"/>

7
res/layout/homepage_slice_tile.xml
View File

@@ -20,12 +20,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/homepage_card_top_margin"
android:layout_marginBottom="@dimen/homepage_card_bottom_margin"
android:layout_marginStart="@dimen/homepage_card_side_margin"
android:layout_marginEnd="@dimen/homepage_card_side_margin"
app:cardCornerRadius="@dimen/homepage_card_corner_radius"
app:cardElevation="@dimen/homepage_card_elevation">
style="@style/ContextualCardStyle">
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"

9
res/values/styles.xml
View File

@@ -458,4 +458,13 @@
<item name="android:paddingBottom">24dp</item>
</style>
<style name="ContextualCardStyle">
<item name="android:layout_marginTop">@dimen/homepage_card_top_margin</item>
<item name="android:layout_marginBottom">@dimen/homepage_card_bottom_margin</item>
<item name="android:layout_marginStart">@dimen/homepage_card_side_margin</item>
<item name="android:layout_marginEnd">@dimen/homepage_card_side_margin</item>
<item name="cardCornerRadius">@dimen/homepage_card_corner_radius</item>
<item name="cardElevation">@dimen/homepage_card_elevation</item>
</style>
</resources>