Refactored path to directory for instant uploads; fixed some problems with first...

[pub/Android/ownCloud.git] / res / layout / account_setup.xml

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index c484271..ded27e2 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -2,11 +2,12 @@
 <!--
   ownCloud Android client application\r
 \r
-  Copyright (C) 2012  Bartek Przybylski\r
+  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
-  it under the terms of the GNU General Public License as published by\r
-  the Free Software Foundation, either version 3 of the License, or\r
-  (at your option) any later version.\r
+  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
@@ -17,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:focusable="true"
@@ -60,8 +60,7 @@
                     android:layout_weight="1"
                     android:ems="10"
                     android:hint="@string/auth_host_url"
-                    android:singleLine="true" >
-
+                    android:inputType="textNoSuggestions" >
                     <requestFocus />
                 </EditText>
 
@@ -112,7 +111,6 @@
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:ems="10"
-                android:singleLine="true"
                 android:hint="@string/auth_username"
                 android:inputType="textNoSuggestions" />
 
@@ -128,8 +126,7 @@
                     android:layout_weight="1"
                     android:ems="10"
                     android:hint="@string/auth_password"
-                    android:inputType="textPassword"
-                    android:singleLine="true" />
+                    android:inputType="textPassword"/>
 
                 <ImageView
                     android:id="@+id/viewPassword"
@@ -185,9 +182,8 @@
                        android:paddingTop="10dp"
                        android:paddingBottom="10dp"
                        android:textColor="#0000FF"
-                       android:background="@android:color/transparent"
-                       android:text="@string/auth_register" />
-            
+                       android:background="@android:color/transparent" />
+                       <!-- android:text="@string/app_name @string/auth_register" /-->
         
     </RelativeLayout>