From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 18 Aug 2015 21:20:01 +0000 (+0200)
Subject: Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_... 
X-Git-Tag: beta-20151128~7^2~43
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7f13b98cc06723b129c7fff05fed188612a9f100

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

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

7f13b98cc06723b129c7fff05fed188612a9f100
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 13fdb9eb,47985ce4..3db9b7a3
--- a/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
          
          /// initialize general UI elements
          initOverallUi();
+ 
+         mOkButton = findViewById(R.id.buttonOK);
+         mOkButton.setOnClickListener(new View.OnClickListener() {
+ 
+             @Override
+             public void onClick(View v) {
+                 onOkClick();
+             }
+         });
+ 
+         mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);
+         mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {
+ 
+             @Override
+             public void onClick(View v) {
+                 checkOcServer();
+             }
+         });
          
          mOkButton = findViewById(R.id.buttonOK);
 +        mOkButton.setOnClickListener(new View.OnClickListener() {
 +
 +            @Override
 +            public void onClick(View v) {
 +                onOkClick();
 +            }
 +        });
 +
 +        mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);
 +        mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {
 +
 +            @Override
 +            public void onClick(View v) {
 +                checkOcServer();
 +            }
 +        });
 +
  
          /// initialize block to be moved to single Fragment to check server and get info about it 
          initServerPreFragment(savedInstanceState);