From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 17 Sep 2015 13:39:27 +0000 (+0200)
Subject: Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into... 
X-Git-Tag: beta-20151128~7^2~23
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/eb7bcfbd2e89b0e9dbd416a8c8b8d3ff1265b475?hp=bbbb7026b4809f22ec4964c2789c3a57627cba3c

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

Conflicts:
	owncloud-android-library
	res/layout-land/account_setup.xml
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a072d788..acb5f1d8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="10700200"
-    android:versionName="1.7.2" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="10800000"
+    android:versionName="1.8.0" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index c5163910..766cb0a5 100644
--- a/oc_jb_workaround/AndroidManifest.xml
+++ b/oc_jb_workaround/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android.workaround.accounts"
-    android:versionCode="0100024"
-    android:versionName="1.0.24" >
+    android:versionCode="0100025"
+    android:versionName="1.0.25" >
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/owncloud-android-library b/owncloud-android-library
index 17bb724b..5985ba9a 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 17bb724b4207142d631a5f1c70d1e80c447e2310
+Subproject commit 5985ba9a9fd9a208b2a09ee7809949874e0c3a97
diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 6150ac81..3c7677d9 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -82,7 +82,7 @@
 	        		android:id="@+id/hostUrlFrame"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
+					android:layout_marginBottom="0dp"
 			        >
 					<EditText
 						android:id="@+id/hostUrlInput"
@@ -108,6 +108,7 @@
 					    android:padding="0dp"
 					    android:scaleType="fitCenter"
 					    android:src="@drawable/ic_action_refresh_grey"
+            			android:onClick="onRefreshClick"
 					    android:visibility="gone"
 						android:background="@android:color/transparent"
                         android:contentDescription="@string/auth_refresh_button"