Merge branch 'master' into develop

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f0d00b5..205e5ac 100644 (file)
--- 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 1025bcf..4eea9b3 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -27,7 +27,7 @@
     <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
-        android:layout_above="@id/buttonOK"\r
+        android:layout_above="@+id/bottom_block"\r
         android:layout_alignParentTop="true"\r
         android:orientation="horizontal" >\r
         \r
@@ -186,27 +186,33 @@
                                                           \r
        </LinearLayout>\r
        \r
-       <Button\r
-           android:id="@id/buttonOK"\r
-           android:layout_width="match_parent"\r
-           android:layout_height="wrap_content"\r
-           android:layout_above="@+id/welcome_link"\r
-           android:layout_centerHorizontal="true"\r
-           android:enabled="false"\r
-           android:onClick="onOkClick"\r
-           android:text="@string/setup_btn_connect" />\r
-\r
-       <Button\r
-           android:id="@id/welcome_link"\r
-           android:layout_width="wrap_content"\r
-           android:layout_height="wrap_content"\r
-           android:layout_alignParentBottom="true"\r
-           android:layout_centerHorizontal="true"\r
-           android:background="@android:color/transparent"\r
-           android:onClick="onRegisterClick"\r
-           android:paddingBottom="5dp"\r
-           android:paddingTop="5dp"\r
-           android:text="@string/auth_register"\r
-           android:textColor="#0000FF"/>\r
-       \r
+    <LinearLayout\r
+        android:id="@id/bottom_block"\r
+        android:layout_width="match_parent"\r
+        android:layout_height="wrap_content"\r
+               android:layout_alignParentBottom="true"\r
+        android:orientation="vertical" >\r
+        \r
+               <Button\r
+                   android:id="@+id/buttonOK"\r
+                   android:layout_width="match_parent"\r
+                   android:layout_height="wrap_content"\r
+                   android:layout_gravity="center_horizontal"\r
+                   android:enabled="false"\r
+                   android:onClick="onOkClick"\r
+                   android:text="@string/setup_btn_connect" />\r
+               \r
+               <Button\r
+                   android:id="@+id/welcome_link"\r
+                   android:layout_width="wrap_content"\r
+                   android:layout_height="wrap_content"\r
+                   android:layout_gravity="center_horizontal"\r
+                   android:background="@android:color/transparent"\r
+                   android:onClick="onRegisterClick"\r
+                   android:paddingBottom="5dp"\r
+                   android:paddingTop="5dp"\r
+                   android:text="@string/auth_register"\r
+                   android:textColor="#0000FF"/>\r
+       </LinearLayout>\r
+               \r
 </RelativeLayout>\r