diff options
| author | Xin Li <delphij@google.com> | 2019-09-04 13:34:16 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-09-04 13:34:16 -0700 |
| commit | 3343873fa161579562e82b8fa8963094bac042fb (patch) | |
| tree | d4d0f1ccfa3d6b82ef0a0be0a353328a3001714d /library/gingerbread/res/values/styles.xml | |
| parent | 3df8ec6322b20b4b09010145980c6b4c1ce8a448 (diff) | |
| parent | aa06a98b9387bf7cda7948de3f3949e82c151856 (diff) | |
| download | setupwizard-3343873fa161579562e82b8fa8963094bac042fb.tar.gz | |
DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21
Bug: 139893257
Change-Id: I38429ee13989d447b1350d9f098d22786c2e9447
Diffstat (limited to 'library/gingerbread/res/values/styles.xml')
| -rw-r--r-- | library/gingerbread/res/values/styles.xml | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml index 241f037..b008e1e 100644 --- a/library/gingerbread/res/values/styles.xml +++ b/library/gingerbread/res/values/styles.xml @@ -41,6 +41,7 @@ <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> <item name="suwButtonAllCaps">true</item> <item name="suwButtonFontFamily">sans-serif</item> + <item name="suwButtonHighlightAlpha">0.24</item> <item name="suwCardBackground">@drawable/suw_card_bg_dark</item> <item name="suwDividerInsetEnd">0dp</item> <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item> @@ -75,6 +76,7 @@ <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> <item name="suwButtonAllCaps">true</item> <item name="suwButtonFontFamily">sans-serif</item> + <item name="suwButtonHighlightAlpha">0.24</item> <item name="suwCardBackground">@drawable/suw_card_bg_light</item> <item name="suwDividerInsetEnd">0dp</item> <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item> @@ -109,7 +111,8 @@ <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> <item name="suwButtonAllCaps">true</item> <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item> - <item name="suwButtonFontFamily">sans-serif</item> + <item name="suwButtonFontFamily">sans-serif-medium</item> + <item name="suwButtonHighlightAlpha">0.24</item> <item name="suwColorPrimary">?attr/colorPrimary</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -148,7 +151,8 @@ <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> <item name="suwButtonAllCaps">true</item> <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item> - <item name="suwButtonFontFamily">sans-serif</item> + <item name="suwButtonFontFamily">sans-serif-medium</item> + <item name="suwButtonHighlightAlpha">0.12</item> <item name="suwColorPrimary">?attr/colorPrimary</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -262,6 +266,13 @@ <item name="colorControlHighlight">@color/suw_flat_button_highlight</item> </style> + <!-- Ignore UnusedResources: used by clients --> + <style name="SuwGlifButton.Tertiary" + parent="SuwGlifButton.BaseTertiary" + tools:ignore="UnusedResources"> + <item name="textAllCaps" tools:targetApi="ice_cream_sandwich">false</item> + </style> + <!-- Card layout (for tablets) --> <style name="TextAppearance.SuwCardTitle" parent="@style/TextAppearance.AppCompat.Display1"> @@ -279,6 +290,10 @@ <style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge"> <item name="android:layout_gravity">center</item> <item name="android:indeterminate">true</item> + <item name="android:paddingEnd" tools:targetApi="17" >@dimen/suw_glif_progress_bar_padding</item> + <item name="android:paddingLeft">@dimen/suw_glif_progress_bar_padding</item> + <item name="android:paddingRight">@dimen/suw_glif_progress_bar_padding</item> + <item name="android:paddingStart" tools:targetApi="17" >@dimen/suw_glif_progress_bar_padding</item> </style> <!-- Navigation bar styles --> |