deleted cancel button

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index bdff0bf..e694e9e 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 <!--

-  ownCloud Android client application\r
-\r
+  ownCloud Android client application
+

   Copyright (C) 2012  Bartek Przybylski
   Copyright (C) 2012-2013 ownCloud Inc.
   Copyright (C) 2012  Bartek Przybylski
   Copyright (C) 2012-2013 ownCloud Inc.

-\r
-  This program is free software: you can redistribute it and/or modify\r
+
+  This program is free software: you can redistribute it and/or modify

   it under the terms of the GNU General Public License version 2,
   it under the terms of the GNU General Public License version 2,

-  as published by the Free Software Foundation.\r
-\r
-  This program is distributed in the hope that it will be useful,\r
-  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
-  GNU General Public License for more details.\r
-\r
-  You should have received a copy of the GNU General Public License\r
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+  as published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.

 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"


@@ -155,18 +155,12 @@
             android:weightSum="1">
 
             <Button
             android:weightSum="1">
 
             <Button

-                android:id="@+id/buttonCancel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight=".5"
-                android:onClick="onCancelClick"
-                android:text="@string/common_cancel" />
-
-            <Button

                 android:id="@+id/buttonOK"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight=".5"
                 android:id="@+id/buttonOK"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight=".5"

+                android:layout_marginLeft="16dip"
+                       android:layout_marginRight="16dip"

                 android:enabled="false"
                 android:onClick="onOkClick"
                 android:text="@string/setup_btn_connect"
                 android:enabled="false"
                 android:onClick="onOkClick"
                 android:text="@string/setup_btn_connect"