diff options
Diffstat (limited to 'library/main/res/values/styles.xml')
| -rw-r--r-- | library/main/res/values/styles.xml | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml index 4bd99de..bcdae0e 100644 --- a/library/main/res/values/styles.xml +++ b/library/main/res/values/styles.xml @@ -19,24 +19,38 @@ <!-- General styles --> - <style name="SuwThemeGlifPixel" parent="SuwThemeGlif"> + <style name="SuwThemeGlifV2" parent="SuwThemeGlif"> + <item name="android:colorBackground">@color/suw_glif_background_color_dark</item> <item name="android:windowLightStatusBar" tools:targetApi="m">false</item> <item name="suwBackgroundBaseColor">?android:attr/colorBackground</item> <item name="suwBackgroundPatterned">false</item> + <item name="suwDividerInsetEnd">?attr/suwMarginSides</item> + <item name="suwDividerInsetStart">?attr/suwMarginSides</item> + <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item> <item name="suwGlifHeaderGravity">center_horizontal</item> <item name="suwScrollIndicators">top|bottom</item> </style> - <style name="SuwThemeGlifPixel.Light" parent="SuwThemeGlif.Light"> + <!-- Deprecated. Use SuwThemeGlifV2 instead --> + <style name="SuwThemeGlifPixel" parent="SuwThemeGlifV2" /> + + <style name="SuwThemeGlifV2.Light" parent="SuwThemeGlif.Light"> + <item name="android:colorBackground">@color/suw_glif_background_color_light</item> <item name="android:windowLightStatusBar" tools:targetApi="m">true</item> <item name="suwBackgroundBaseColor">?android:attr/colorBackground</item> <item name="suwBackgroundPatterned">false</item> + <item name="suwDividerInsetEnd">?attr/suwMarginSides</item> + <item name="suwDividerInsetStart">?attr/suwMarginSides</item> + <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item> <item name="suwGlifHeaderGravity">center_horizontal</item> <item name="suwScrollIndicators">top|bottom</item> </style> + <!-- Deprecated. Use SuwThemeGlifV2.Light instead --> + <style name="SuwThemeGlifPixel.Light" parent="SuwThemeGlifV2.Light" /> + <style name="Animation.SuwWindowAnimation" parent="@android:style/Animation.Activity"> <item name="android:activityOpenEnterAnimation">@anim/suw_slide_next_in</item> <item name="android:activityOpenExitAnimation">@anim/suw_slide_next_out</item> @@ -160,7 +174,7 @@ <!-- Use this style with a Button not a TextView, so that TalkBack will announce it as a button. --> - <style name="SuwGlifButton.Tertiary" parent="SuwGlifButton.Secondary"> + <style name="SuwGlifButton.BaseTertiary" parent="SuwGlifButton.Secondary"> <!-- This style can be applied to a button either as a "style" in XML, or as a theme in ContextThemeWrapper. These self-referencing attributes make sure this is applied as both to the button. --> @@ -169,13 +183,17 @@ <item name="android:background">@null</item> <item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item> + <item name="android:layout_gravity">?attr/suwGlifHeaderGravity</item> <item name="android:padding">0dp</item> <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">false</item> </style> + <style name="SuwGlifButton.Tertiary" parent="SuwGlifButton.BaseTertiary" /> + <!-- The start and end paddings are asymmetric because start buttons are borderless buttons which aligns the text label. --> <style name="SuwGlifButtonBar"> + <item name="android:baselineAligned">false</item> <item name="android:clipChildren">false</item> <item name="android:clipToPadding">false</item> <item name="android:gravity">center_vertical</item> @@ -206,7 +224,7 @@ <item name="android:paddingTop">@dimen/suw_items_verbose_padding_vertical</item> </style> - <style name="SuwItemTitle.Description" parent="SuwItemTitle"> + <style name="SuwItemTitle.GlifDescription" parent="SuwItemTitle"> <item name="android:gravity">?attr/suwGlifHeaderGravity</item> <item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item> </style> @@ -228,6 +246,7 @@ <item name="android:layout_marginLeft">?attr/suwMarginSides</item> <item name="android:layout_marginRight">?attr/suwMarginSides</item> <item name="android:layout_marginTop">@dimen/suw_glif_header_title_margin_top</item> + <item name="android:fontFamily" tools:targetApi="jelly_bean">google-sans</item> <item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item> <item name="android:textColor">?android:attr/textColorPrimary</item> </style> |