Merge upstream

This commit is contained in:
Eugen Rochko 2017-03-10 04:35:08 +01:00
commit 473f7f75f1
6 changed files with 45 additions and 6 deletions

View file

@ -65,6 +65,16 @@
<item name="material_drawer_selected">@color/color_primary_dark</item>
<item name="material_drawer_selected_text">@color/text_color_primary_dark</item>
<item name="material_drawer_header_selection_text">@color/text_color_primary_dark</item>
<item name="floatingSearch_backgroundColor">@color/toolbar_background_dark</item>
<item name="floatingSearch_viewTextColor">@color/text_color_secondary_dark</item>
<item name="floatingSearch_hintTextColor">@color/text_color_tertiary_dark</item>
<item name="floatingSearch_dividerColor">@color/status_divider_dark</item>
<item name="floatingSearch_clearBtnColor">@color/toolbar_icon_dark</item>
<item name="floatingSearch_leftActionColor">@color/toolbar_icon_dark</item>
<item name="floatingSearch_menuItemIconColor">@color/toolbar_icon_dark</item>
<item name="floatingSearch_suggestionRightIconColor">@color/toolbar_icon_dark</item>
<item name="floatingSearch_actionMenuOverflowColor">@color/toolbar_icon_dark</item>-->
</style>
<style name="AppTheme.ImageButton.Dark" parent="@style/Widget.AppCompat.Button.Borderless.Colored">