Clean up the whole tree

[unical.git] / res / layout / login.xml

diff --git a/res/layout/login.xml b/res/layout/login.xml
index c04cf763bf108ec860c16a3c9636c923a6b591c6..e3af67c3effe6ae619a71b8caa2af571c01f4c47 100644 (file)
--- a/res/layout/login.xml
+++ b/res/layout/login.xml
@@ -4,60 +4,25 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
-    <TextView
-        android:id="@+id/textView1"
+    <EditText
+        android:id="@+id/usernameEditText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/login"
-        android:textAlignment="center"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        android:ems="10"
+        android:hint="@string/username" />
 
-    <LinearLayout
+    <EditText
+        android:id="@+id/passwordEditText"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/location"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/userlabel"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <EditText
-            android:id="@+id/editText1"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
-        <TextView
-            android:id="@+id/textView3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/passwordlabel"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <EditText
-            android:id="@+id/editText2"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.62"
-            android:ems="10"
-            android:inputType="textPassword" >
-
-            <requestFocus />
-        </EditText>
-    </LinearLayout>
+        android:layout_height="wrap_content"
+        android:ems="10"
+               android:hint = "@string/password"
+        android:inputType="textPassword" />
 
     <Button
         android:id="@+id/button1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/login" />
+        android:text="@string/log_in" />
 
 </LinearLayout>
\ No newline at end of file