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

Merge "Revise homepage sticky cards UI"

Browse Source
This commit is contained in:
Jason Chiu
2020-02-12 15:58:52 +00:00
committed by Android (Google) Code Review
parent 4bd4a72d5a 55563896be
commit d13734fe59
6 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
res/layout/contextual_slice_full_tile.xml
View File

@@ -21,23 +21,17 @@
android:layout_height="wrap_content"
style="@style/ContextualCardStyle">
<FrameLayout
<include layout="@layout/dismissal_swipe_background"/>
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
android:theme="@style/Theme.Settings.ContextualCard"
style="@style/ContextualCardSliceViewStyle"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content"
android:importantForAccessibility="no"/>
<include layout="@layout/dismissal_swipe_background"/>
<!--dismissal view-->
<include layout="@layout/contextual_card_dismissal_view"/>
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
android:theme="@style/Theme.Settings.ContextualCard"
style="@style/ContextualCardSliceViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:importantForAccessibility="no"/>
<!--dismissal view-->
<include layout="@layout/contextual_card_dismissal_view"/>
</FrameLayout>
</com.google.android.material.card.MaterialCardView>

11
res/layout/contextual_slice_sticky_tile.xml
View File

@@ -15,11 +15,12 @@
limitations under the License.
-->
<com.google.android.material.card.MaterialCardView
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/ContextualCardStyle">
android:orientation="vertical"
style="@style/StickyCardStyle">
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
@@ -27,7 +28,9 @@
style="@style/ContextualCardSliceViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="@dimen/contextual_card_vertical_margin"
android:importantForAccessibility="no"/>
</com.google.android.material.card.MaterialCardView>
<include layout="@layout/horizontal_divider"/>
</LinearLayout>