From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 16 Sep 2015 15:38:17 +0000 (+0200)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~41
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d78077de4da35f0104457c60675421c3f01ba396?hp=9f8e478865fafabc7405671ad6c768b7e035107a

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

Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
---

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index ddd6b05f..6150ac81 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -101,8 +101,8 @@
 					</EditText>
 					<ImageButton
 					    android:id="@+id/embeddedRefreshButton"
-					    android:layout_width="48dp"
-					    android:layout_height="48dp"
+					    android:layout_width="wrap_content"
+					    android:layout_height="wrap_content"
 					    android:layout_gravity="center_vertical|right"
 					    android:layout_marginRight="5dp"
 					    android:padding="0dp"
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index d7e5f602..73bd6e4a 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -260,7 +260,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             }
         });
 
-        findViewById(R.id.embeddedRefreshButton).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.centeredRefreshButton).setOnClickListener(new View.OnClickListener() {
 
             @Override
             public void onClick(View v) {
@@ -268,7 +268,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             }
         });
 
-        findViewById(R.id.centeredRefreshButton).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.embeddedRefreshButton).setOnClickListener(new View.OnClickListener() {
 
             @Override
             public void onClick(View v) {