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

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a072d78..acb5f1d 100644 (file)
--- 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 c516391..766cb0a 100644 (file)
--- 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 17bb724..5985ba9 160000 (submodule)
--- 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 6150ac8..3c7677d 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -82,7 +82,7 @@
                                android:id="@+id/hostUrlFrame"\r
                                        android:layout_width="match_parent"\r
                                        android:layout_height="wrap_content"\r
-                                       android:layout_marginBottom="10dp"\r
+                                       android:layout_marginBottom="0dp"\r
                                >\r
                                        <EditText\r
                                                android:id="@+id/hostUrlInput"\r
@@ -108,6 +108,7 @@
                                            android:padding="0dp"\r
                                            android:scaleType="fitCenter"\r
                                            android:src="@drawable/ic_action_refresh_grey"\r
+                               android:onClick="onRefreshClick"\r
                                            android:visibility="gone"\r
                                                android:background="@android:color/transparent"\r
                         android:contentDescription="@string/auth_refresh_button"\r