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

Merge "Leverage the panel title font size of non-first row" into rvc-dev am: 6ea346edfe

Browse Source 
Change-Id: I1ee6246f38d59f928b6a960bd0a78005e7404300
This commit is contained in:
TreeHugger Robot
2020-05-08 06:32:34 +00:00
committed by Automerger Merge Worker
parent c497fc6670 6ea346edfe
commit 4de3eca090
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/contextual_slice_full_tile.xml
View File

@@ -27,7 +27,7 @@
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
android:theme="@style/Theme.Settings.ContextualCard"
style="@style/ContextualCardSliceViewStyle"
style="@style/Widget.SliceView.ContextualCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

2
res/layout/contextual_slice_sticky_tile.xml
View File

@@ -25,7 +25,7 @@
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
android:theme="@style/Theme.Settings.ContextualCard"
style="@style/ContextualCardSliceViewStyle"
style="@style/Widget.SliceView.ContextualCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

2
res/layout/panel_slice_row.xml
View File

@@ -22,7 +22,7 @@
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
style="@style/SliceViewStyle"
style="@style/Widget.SliceView.Panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="8dp"

2
res/layout/panel_slice_slider_row.xml
View File

@@ -23,7 +23,7 @@
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
style="@style/SliceViewSliderStyle"
style="@style/Widget.SliceView.Panel.Slider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="0dp"

21
res/values/styles.xml
View File

@@ -498,20 +498,20 @@
<style name="Widget.SliceView.Settings">
<item name="titleSize">@*android:dimen/text_size_subhead_material</item>
<item name="rowStyle">@style/SliceRowStyle.Settings</item>
<item name="rowStyle">@style/SliceRow.Settings</item>
</style>
<style name="SliceViewStyle">
<item name="rowStyle">@style/SliceRowStyle</item>
<style name="Widget.SliceView.Panel">
<item name="titleSize">16sp</item>
<item name="rowStyle">@style/SliceRow</item>
<item name="android:background">?android:attr/colorBackgroundFloating</item>
</style>
<style name="SliceViewSliderStyle">
<item name="rowStyle">@style/SliceRowSliderStyle</item>
<item name="android:background">?android:attr/colorBackgroundFloating</item>
<style name="Widget.SliceView.Panel.Slider">
<item name="rowStyle">@style/SliceRow.Slider</item>
</style>
<style name="SliceRowSliderStyle">
<style name="SliceRow.Slider">
<!-- 2dp start padding for the start icon -->
<item name="titleItemStartPadding">10dp</item>
<item name="titleItemEndPadding">0dp</item>
@@ -535,11 +535,12 @@
<item name="subContentStartPadding">6dp</item>
</style>
<style name="ContextualCardSliceViewStyle" parent="SliceViewStyle">
<style name="Widget.SliceView.ContextualCard">
<item name="rowStyle">@style/SliceRow</item>
<item name="android:background">@color/contextual_card_background</item>
</style>
<style name="SliceRowStyle">
<style name="SliceRow">
<!-- 2dp start padding for the start icon -->
<item name="titleItemStartPadding">2dp</item>
<item name="titleItemEndPadding">0dp</item>
@@ -560,7 +561,7 @@
<item name="actionDividerHeight">32dp</item>
</style>
<style name="SliceRowStyle.Settings">
<style name="SliceRow.Settings">
<!-- Padding between content and the start icon is 8dp -->
<item name="contentStartPadding">8dp</item>
</style>