diff options
Diffstat (limited to 'res/values/styles.xml')
| -rwxr-xr-x | res/values/styles.xml | 116 |
1 files changed, 34 insertions, 82 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index dc807cb..071792b 100755 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -32,7 +32,8 @@ <item name="colorControlHighlight">@color/ripple_material_dark</item> <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> - <item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item> + <item name="toolbarNavigationButtonStyle">@android:style/Widget.Toolbar.Button.Navigation + </item> <item name="android:windowActionBar">false</item> <item name="android:windowNoTitle">true</item> @@ -66,7 +67,8 @@ <item name="selectableItemBackground">?android:attr/selectableItemBackground</item> <item name="dialogPreferredPadding">24dp</item> <item name="colorControlHighlight">@color/ripple_material_dark</item> - <item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item> + <item name="toolbarNavigationButtonStyle">@android:style/Widget.Toolbar.Button.Navigation + </item> <!-- Set status bar and navigation buttons to be translucent. --> <item name="android:colorPrimaryDark">@color/translucent_black</item> @@ -74,83 +76,55 @@ <item name="android:navigationBarColor">@android:color/transparent</item> <!-- Apply borderless button style for the right ripple effect. --> - <item name="borderlessButtonStyle">@style/Widget.AppCompat.Button.Borderless</item> + <item name="borderlessButtonStyle">@android:style/Widget.DeviceDefault.Button.Borderless + </item> <item name="android:actionBarItemBackground"> ?android:attr/selectableItemBackgroundBorderless </item> </style> - <style name="WallpaperTheme.DarkActionBar" parent="@style/WallpaperTheme.Preview"> - <item name="colorControlNormal">?attr/colorPrimary</item> - <item name="colorButtonNormal">?attr/colorPrimary</item> - <item name="android:colorControlActivated">?attr/colorPrimary</item> - <item name="android:colorControlHighlight">?attr/colorPrimary</item> - <item name="actionMenuTextColor">?attr/colorPrimary</item> - <item name="android:actionMenuTextColor">?attr/colorPrimary</item> - <item name="android:actionMenuTextAppearance">@style/WallpaperPicker.Preview.TextAppearance.ActionBar</item> - </style> - - <!-- Toolbar --> - <style name="TranslucentToolbarStyle" parent="@style/Widget.AppCompat.Toolbar"> - <item name="android:background">@android:color/transparent</item> - <item name="android:theme">@style/WallpaperTheme.DarkActionBar</item> - </style> - - <style name="RegularToolbarStyle" parent="@style/Widget.AppCompat.Toolbar"> - <item name="android:background">@color/toolbar_color</item> - <item name="android:elevation">0dp</item> - <item name="android:theme">@style/WallpaperTheme</item> - </style> - <!-- Dialog themes --> <style name="LightDialogTheme" parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar"> <item name="android:layout">@layout/abc_alert_dialog_material</item> <item name="windowActionBar">false</item> + <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item> + <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item> + <item name="android:dialogCornerRadius">24dp</item> </style> <style name="ProgressDialogThemePreL" parent="@style/Theme.AppCompat.Light.Dialog.Alert"> <item name="android:windowBackground">@android:color/transparent</item> </style> - <!-- Individual components / Widgets --> + <!-- Text appearance --> <style name="TitleTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"/> <style name="SubtitleTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Subtitle"/> - <style name="ButtonStyle" parent="@android:style/Widget.DeviceDefault.Button.Colored"> - <item name="android:padding">16dp</item> - <item name="android:minHeight">48dp</item> + <style name="SeparatedTabsTextAppearance" parent="TitleTextAppearance"> + <item name="android:textStyle" /> + <item name="textAllCaps">false</item> + <item name="android:textSize">14sp</item> + <item name="android:letterSpacing">0.02</item> </style> + <!-- Individual components / Widgets --> <style name="OutlinedButtonStyle" parent="@android:style/Widget.DeviceDefault.Button"> <item name="android:background">@drawable/btn_transparent</item> <item name="android:textColor">?android:attr/colorAccent</item> </style> - <style name="ActionBarCheckboxStyle" parent="@android:style/Widget.DeviceDefault.CompoundButton.CheckBox"> - <item name="android:textColor">?android:attr/colorPrimary</item> - </style> - - <style name="PreviewCheckboxDeviceTheme" parent="@android:style/Theme.DeviceDefault"> - <item name="android:colorControlNormal">?android:attr/colorPrimary</item> - </style> - - <style name="select_wallpaper_header"> - <item name="android:textColor">@color/translucent_black_60_alpha</item> - <item name="android:textStyle">bold</item> - <item name="android:textSize">@dimen/abc_text_size_body_2_material</item> + <style name="ExploreButtonStyle" parent="OutlinedButtonStyle"> + <item name="android:insetLeft">0dp</item> + <item name="android:insetRight">0dp</item> + <item name="android:minWidth">0dp</item> + <item name="android:minHeight">22sp</item> + <item name="android:textSize">16sp</item> </style> <!-- Preview attribution pane styles --> - <style name="WallpaperPicker.BottomPaneStyle" parent="@android:style/Theme.DeviceDefault.Settings"> - <item name="android:textColorPrimary">@color/material_white_100</item> - <item name="android:textColorSecondary">@color/white_70_alpha</item> - <item name="tabTextAppearance">@style/WallpaperPicker.Preview.TextAppearance.NoAllCaps</item> - <item name="tabIndicatorColor">?android:attr/textColorPrimary</item> - <item name="tabGravity">fill</item> - <item name="tabMaxWidth">0dp</item> - </style> + <style name="WallpaperPicker.BottomPaneStyle" parent="@android:style/Theme.DeviceDefault.Settings"/> <!-- Preview customization pane styles --> <style name="WallpaperPicker.CustomizationPaneStyle" parent="@android:style/Theme.DeviceDefault.Settings"> @@ -160,43 +134,23 @@ <item name="tabMaxWidth">0dp</item> </style> - <style name="preview_attribution_pane_title"> - <item name="android:textColor">@color/material_white_text</item> - <item name="android:textSize">@dimen/abc_text_size_subhead_material</item> - </style> - - <style name="preview_attribution_pane_subtitle"> - <item name="android:textColor">@color/material_white_text</item> - <item name="android:textSize">@dimen/abc_text_size_body_2_material</item> - </style> - <style name="WallpaperPicker.Preview.TextAppearance.NoAllCaps" parent="@android:style/TextAppearance.DeviceDefault.Widget.TabWidget"> <item name="android:textAllCaps">false</item> </style> - <style name="WallpaperPicker.Preview.TextAppearance.ActionBar" - parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Menu"> - <item name="android:textAllCaps">false</item> - <item name="android:textColor">@color/material_white_100</item> - </style> - <!-- Set wallpaper destination item --> + <!-- Studio can't directly reference ?androidprv:attr/textColorOnAccent here, + so we set the text color on the dialog items instead. --> <style name="set_wallpaper_destination_item"> + <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item> <item name="android:minHeight">@dimen/set_wallpaper_dialog_item_min_height</item> - <item name="android:textAlignment">viewStart</item> - <item name="android:textAppearance">?attr/textAppearanceListItemSmall</item> - <item name="android:textColor">?android:attr/textColorPrimary</item> - <item name="android:textSize">@dimen/abc_text_size_subhead_material</item> - <item name="android:gravity">center_vertical</item> - <item name="android:alpha">.87</item> - <item name="android:paddingStart">?attr/dialogPreferredPadding</item> - <item name="android:paddingEnd">?attr/dialogPreferredPadding</item> - <item name="android:background">?attr/selectableItemBackground</item> - <item name="android:drawablePadding">@dimen/set_wallpaper_dialog_item_drawable_padding - </item> - <item name="android:drawableTint">?android:colorAccent</item> - <item name="android:drawableTintMode">src_atop</item> + <item name="android:minWidth">@dimen/set_wallpaper_dialog_item_min_width</item> + <item name="android:textAlignment">center</item> + <item name="android:textSize">@dimen/abc_text_size_small_material</item> + <item name="android:letterSpacing">0.02</item> + <item name="android:gravity">center</item> + <item name="android:background">@drawable/dialog_option_background</item> </style> <!-- Desktop UI - category tabs layout --> @@ -217,18 +171,16 @@ <item name="cardCornerRadius">?android:dialogCornerRadius</item> <item name="android:clipChildren">true</item> <item name="contentPadding">@dimen/preview_card_padding</item> - <item name="cardBackgroundColor">?android:colorPrimary</item> + <item name="cardElevation">0dp</item> </style> <style name="FullContentPreviewCard" parent="PreviewCard"> - <item name="android:clipChildren">true</item> <item name="contentPadding">0dp</item> - <item name="cardBackgroundColor">?android:colorPrimary</item> </style> <!-- Bottom action item --> <style name="BottomActionItemStyle"> - <item name="android:tint">@color/material_grey500</item> + <item name="android:paddingHorizontal">@dimen/bottom_action_button_padding_horizontal</item> </style> <!-- Option tiles --> |