Merge master into oauth_login

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

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index ce498dd..6790529 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -59,7 +59,6 @@
                     android:layout_weight="1"
                     android:ems="10"
                     android:hint="@string/auth_host_url"
-                    android:singleLine="true"
                     android:inputType="textNoSuggestions" >
                     <requestFocus />
                 </EditText>
@@ -153,7 +152,6 @@
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:ems="10"
-                android:singleLine="true"
                 android:hint="@string/auth_username"
                 android:inputType="textNoSuggestions" />
 
@@ -169,8 +167,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"
@@ -226,9 +223,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>