From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 4 Dec 2013 11:09:22 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.5.5~112
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/34923cf74ba9a09e10276bc919f05ddadc7ab6f7?hp=a9da7583d6dd83a88f056fc4e99ec70647ccc1c2

Merge branch 'master' into develop
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f0d00b5c..205e5acb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,8 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="105000"
-    android:versionName="1.5.0" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="105001"
+    android:versionName="1.5.1" 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/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 1025bcff..4eea9b36 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -27,7 +27,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@id/buttonOK"
+        android:layout_above="@+id/bottom_block"
         android:layout_alignParentTop="true"
         android:orientation="horizontal" >
         
@@ -186,27 +186,33 @@
 						           
 	</LinearLayout>
        
-	<Button
-	    android:id="@id/buttonOK"
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_above="@+id/welcome_link"
-	    android:layout_centerHorizontal="true"
-	    android:enabled="false"
-	    android:onClick="onOkClick"
-	    android:text="@string/setup_btn_connect" />
-
-	<Button
-	    android:id="@id/welcome_link"
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:layout_alignParentBottom="true"
-	    android:layout_centerHorizontal="true"
-	    android:background="@android:color/transparent"
-	    android:onClick="onRegisterClick"
-	    android:paddingBottom="5dp"
-	    android:paddingTop="5dp"
-	    android:text="@string/auth_register"
-	    android:textColor="#0000FF"/>
-	
+    <LinearLayout
+        android:id="@id/bottom_block"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+        android:orientation="vertical" >
+        
+		<Button
+		    android:id="@+id/buttonOK"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:layout_gravity="center_horizontal"
+		    android:enabled="false"
+		    android:onClick="onOkClick"
+		    android:text="@string/setup_btn_connect" />
+		
+		<Button
+		    android:id="@+id/welcome_link"
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:layout_gravity="center_horizontal"
+		    android:background="@android:color/transparent"
+		    android:onClick="onRegisterClick"
+		    android:paddingBottom="5dp"
+		    android:paddingTop="5dp"
+		    android:text="@string/auth_register"
+		    android:textColor="#0000FF"/>
+	</LinearLayout>
+		
 </RelativeLayout>