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

Merge "Rearrange styles and remove the same attributes as the parent style" into rvc-dev am: b0230a6106 am: 16c6b13ab4 am: 00ab4b4861 am: fb7881aaa9

Browse Source 
Change-Id: Ifabf88bdb79bc58bac5dfd3fde27ce22260cac58
This commit is contained in:
Jason Chiu
2020-05-12 10:36:08 +00:00
committed by Automerger Merge Worker
parent 6f2741862c fb7881aaa9
commit b2ea4ce87c
1 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
res/values/styles.xml
View File

@@ -501,6 +501,11 @@
<item name="rowStyle">@style/SliceRow.Settings</item> <item name="rowStyle">@style/SliceRow.Settings</item>
</style> </style>
<style name="Widget.SliceView.ContextualCard">
<item name="rowStyle">@style/SliceRow</item>
<item name="android:background">@color/contextual_card_background</item>
</style>
<style name="Widget.SliceView.Panel"> <style name="Widget.SliceView.Panel">
<item name="titleSize">16sp</item> <item name="titleSize">16sp</item>
<item name="rowStyle">@style/SliceRow</item> <item name="rowStyle">@style/SliceRow</item>
@@ -511,35 +516,6 @@
<item name="rowStyle">@style/SliceRow.Slider</item> <item name="rowStyle">@style/SliceRow.Slider</item>
</style> </style>
<style name="SliceRow.Slider">
<!-- 2dp start padding for the start icon -->
<item name="titleItemStartPadding">10dp</item>
<item name="titleItemEndPadding">0dp</item>
<!-- Padding between content and the start icon is 14dp -->
<item name="contentStartPadding">5dp</item>
<!-- Padding between content and end items is 16dp -->
<item name="contentEndPadding">16dp</item>
<!-- Both side margins of end item are 16dp -->
<item name="endItemStartPadding">0dp</item>
<item name="endItemEndPadding">24dp</item>
<!-- Both side margins of bottom divider are 12dp -->
<item name="bottomDividerStartPadding">12dp</item>
<item name="bottomDividerEndPadding">12dp</item>
<item name="actionDividerHeight">32dp</item>
<!-- Align text with slider -->
<item name="titleStartPadding">6dp</item>
<item name="subContentStartPadding">6dp</item>
</style>
<style name="Widget.SliceView.ContextualCard">
<item name="rowStyle">@style/SliceRow</item>
<item name="android:background">@color/contextual_card_background</item>
</style>
<style name="SliceRow"> <style name="SliceRow">
<!-- 2dp start padding for the start icon --> <!-- 2dp start padding for the start icon -->
<item name="titleItemStartPadding">2dp</item> <item name="titleItemStartPadding">2dp</item>
@@ -566,6 +542,23 @@
<item name="contentStartPadding">8dp</item> <item name="contentStartPadding">8dp</item>
</style> </style>
<style name="SliceRow.Slider">
<!-- 10dp start padding for the start icon -->
<item name="titleItemStartPadding">10dp</item>
<!-- Padding between content and the start icon is 5dp -->
<item name="contentStartPadding">5dp</item>
<!-- 0dp start padding for the end item -->
<item name="endItemStartPadding">0dp</item>
<!-- 24dp end padding for the end item -->
<item name="endItemEndPadding">24dp</item>
<!-- Align text with slider -->
<item name="titleStartPadding">6dp</item>
<item name="subContentStartPadding">6dp</item>
</style>
<style name="DisclaimerPositiveButton" parent="@style/SudGlifButton.Primary"> <style name="DisclaimerPositiveButton" parent="@style/SudGlifButton.Primary">
<item name="android:layout_margin">16dp</item> <item name="android:layout_margin">16dp</item>
<item name="android:paddingStart">8dp</item> <item name="android:paddingStart">8dp</item>