[tx-robot] updated from transifex

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

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 5f12872..cbb4411 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -2,10 +2,12 @@
 <!--
   ownCloud Android client application\r
 \r
 <!--
   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
   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
+  the Free Software Foundation, either version 2 of the License, or\r

   (at your option) any later version.\r
 \r
   This program is distributed in the hope that it will be useful,\r
   (at your option) any later version.\r
 \r
   This program is distributed in the hope that it will be useful,\r


@@ -17,7 +19,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   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"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:focusable="true"


@@ -60,8 +61,7 @@
                     android:layout_weight="1"
                     android:ems="10"
                     android:hint="@string/auth_host_url"
                     android:layout_weight="1"
                     android:ems="10"
                     android:hint="@string/auth_host_url"

-                    android:singleLine="true" >
-
+                    android:inputType="textNoSuggestions" >

                     <requestFocus />
                 </EditText>
 
                     <requestFocus />
                 </EditText>
 


@@ -112,8 +112,8 @@
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:ems="10"
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:ems="10"

-                android:singleLine="true"
-                android:hint="@string/auth_username" />
+                android:hint="@string/auth_username"
+                android:inputType="textNoSuggestions" />

 
             <FrameLayout
                 android:layout_width="match_parent"
 
             <FrameLayout
                 android:layout_width="match_parent"


@@ -127,8 +127,7 @@
                     android:layout_weight="1"
                     android:ems="10"
                     android:hint="@string/auth_password"
                     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"
 
                 <ImageView
                     android:id="@+id/viewPassword"


@@ -140,16 +139,16 @@
 
             </FrameLayout>
 
 
             </FrameLayout>
 

-        </LinearLayout>
+            </LinearLayout>

 
     </FrameLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"
 
     </FrameLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"

-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true" >
+        android:layout_height="wrap_content">

 
         <LinearLayout
 
         <LinearLayout

+            android:id="@+id/buttons_layout"

             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:weightSum="1" >
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:weightSum="1" >


@@ -173,6 +172,20 @@
                 android:textColor="@android:color/black" />
 
         </LinearLayout>
                 android:textColor="@android:color/black" />
 
         </LinearLayout>

+        
+               <Button
+                       android:id="@+id/account_register"
+                       android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_below="@id/buttons_layout"
+                       android:layout_centerHorizontal="true"
+                       android:onClick="onRegisterClick"
+                       android:paddingTop="10dp"
+                       android:paddingBottom="10dp"
+                       android:textColor="#0000FF"
+                       android:background="@android:color/transparent" />
+                       <!-- android:text="@string/app_name @string/auth_register" /-->
+        

     </RelativeLayout>
 
 </LinearLayout>
     </RelativeLayout>
 
 </LinearLayout>