Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...

Conflicts:
	res/layout/ssl_untrusted_cert_layout.xml
	res/layout/ssl_validator_layout.xml

diff --combined res/values/styles.xml
index 1716a50,555d28c..3bb1fe4
--- 1/res/values/styles.xml
--- 2/res/values/styles.xml
+++ b/res/values/styles.xml
@@@ -21,23 -21,31 +21,23 @@@
        <style name="Animations" />
  
        <!-- General ownCloud app style -->
 -      <style name="Theme.ownCloud" parent="style/Theme.AppCompat.Light.DarkActionBar">
 +      <style name="Theme.ownCloud" parent="Theme.AppCompat.Light.DarkActionBar">
        <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
        <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
 -      <item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
                <item name="colorPrimary">@color/primary</item>
                <item name="colorPrimaryDark">@color/primary_dark</item>
                <item name="colorAccent">@color/color_accent</item>
                <item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
 -              <item name="colorButtonNormal">@color/background_color</item>
 -              <item name="colorControlActivated">@color/primary_dark</item>
 -              <item name="colorControlHighlight">@color/color_accent</item>
        </style>
  
        <!-- seperate action bar style for activities without an action bar -->
 -      <style name="Theme.ownCloud.noActionBar" parent="style/Theme.AppCompat.Light.DarkActionBar">
 -              <item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
 +      <style name="Theme.ownCloud.noActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
                <item name="windowNoTitle">true</item>
                <item name="windowActionBar">false</item>
                <item name="colorPrimary">@color/primary</item>
                <item name="colorPrimaryDark">@color/primary_dark</item>
                <item name="colorAccent">@color/color_accent</item>
                <item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
 -              <item name="colorButtonNormal">@color/background_color</item>
 -              <item name="colorControlActivated">@color/primary_dark</item>
 -              <item name="colorControlHighlight">@color/color_accent</item>
      </style>
  
        <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar">
@@@ -46,18 -54,14 +46,22 @@@
  
        <style name="ownCloud.Button" parent="Widget.AppCompat.Button">
                <item name="colorButtonNormal">@color/primary</item>
 -              <item name="colorControlActivated">@color/primary_dark</item>
 -              <item name="colorControlHighlight">@color/color_accent</item>
 +      </style>
 +
 +      <style name="Button" parent="Base.Widget.AppCompat.Button">
 +              <item name="colorButtonNormal">@color/secondary_button_color</item>
 +              <item name="android:textColor">@color/color_accent</item>
 +      </style>
 +
 +      <style name="Button.Primary" parent="Button">
 +              <item name="colorButtonNormal">@color/primary_button_color</item>
 +              <item name="android:textColor">@color/white</item>
        </style>
  
+       <style name="Button.Borderless" parent="Base.Widget.AppCompat.Button.Borderless">
+               <item name="android:textColor">@color/color_accent</item>
+       </style>
+ 
        <!-- separat translucent action bar style -->
        <style name="Theme.ownCloud.Overlay" parent="style/Theme.ownCloud">
                <item name="android:actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>