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

Conflicts:
	res/layout-land/account_setup.xml
	res/layout/account_setup.xml

diff --cc res/values/styles.xml
Simple merge

diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 13fdb9e,47985ce..3db9b7a
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -251,25 -251,26 +251,43 @@@ public class AuthenticatorActivity exte
          \r
          /// initialize general UI elements\r
          initOverallUi();\r
+ \r
+         mOkButton = findViewById(R.id.buttonOK);\r
+         mOkButton.setOnClickListener(new View.OnClickListener() {\r
+ \r
+             @Override\r
+             public void onClick(View v) {\r
+                 onOkClick();\r
+             }\r
+         });\r
+ \r
+         mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);\r
+         mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {\r
+ \r
+             @Override\r
+             public void onClick(View v) {\r
+                 checkOcServer();\r
+             }\r
+         });\r
          \r
          mOkButton = findViewById(R.id.buttonOK);\r
 +        mOkButton.setOnClickListener(new View.OnClickListener() {\r
 +\r
 +            @Override\r
 +            public void onClick(View v) {\r
 +                onOkClick();\r
 +            }\r
 +        });\r
 +\r
 +        mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);\r
 +        mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {\r
 +\r
 +            @Override\r
 +            public void onClick(View v) {\r
 +                checkOcServer();\r
 +            }\r
 +        });\r
 +\r
  \r
          /// initialize block to be moved to single Fragment to check server and get info about it \r
          initServerPreFragment(savedInstanceState);\r