# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1246038623 -7200
# Node ID f930c6558d373c656d6f7b7d9b2d833716e57e08
# Parent  5efd53751e9ede7397729c9596c773f53eb11e04
simplify some layouts

diff -r 5efd53751e9e -r f930c6558d37 res/layout/addcontact.xml
--- a/res/layout/addcontact.xml	Fri Jun 26 18:57:17 2009 +0200
+++ b/res/layout/addcontact.xml	Fri Jun 26 19:50:23 2009 +0200
@@ -1,45 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
-	<LinearLayout
-		android:orientation="horizontal" android:layout_width="fill_parent"
-		android:layout_height="wrap_content">
-		<TextView android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:text="@string/AddCLogin"
-			android:minWidth="70dp" />
-
-		<EditText android:id="@+id/addc_login" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:singleLine="true"
-			android:textSize="16sp" android:autoText="false" android:capitalize="none"
-			android:minWidth="250dp" android:scrollHorizontally="true" />
-	</LinearLayout>
-
-	<LinearLayout
-		android:orientation="horizontal" android:layout_width="fill_parent"
-		android:layout_height="wrap_content">
-		<TextView android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:text="@string/AddCAlias"
-			android:minWidth="70dp" />
-		<EditText android:id="@+id/addc_alias" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:singleLine="true"
-			android:textSize="16sp" android:autoText="false" android:minWidth="250dp"
-			android:capitalize="none" android:scrollHorizontally="true" />
-	</LinearLayout>
-	<LinearLayout
-		android:orientation="horizontal" android:layout_width="fill_parent"
-		android:layout_height="wrap_content">
-		<TextView android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:text="@string/AddCGroup"
-			android:minWidth="70dp" />
-		<EditText android:id="@+id/addc_group" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:singleLine="true"
-			android:textSize="16sp" android:autoText="false" android:minWidth="250dp"
-			android:capitalize="none" android:scrollHorizontally="true" />
-	</LinearLayout>
+	<TableRow>
+		<TextView android:text="@string/AddCLogin"
+			android:gravity="left" android:padding="3dip" 
+			/>
+		<EditText android:id="@+id/addc_login" android:inputType="textEmailAddress"
+			android:minWidth="250dp" android:scrollHorizontally="true"
+			android:padding="3dip"
+			 />
+	</TableRow>
+	<TableRow>
+		<TextView android:text="@string/AddCAlias"
+			android:gravity="left" android:padding="3dip" />
+		<EditText android:id="@+id/addc_alias" android:inputType="text"
+			android:textSize="16sp" android:minWidth="250dp"
+			android:scrollHorizontally="true"
+			android:padding="3dip" />
+	</TableRow>
+	<TableRow>
+		<TextView android:text="@string/AddCGroup"
+			android:minWidth="70dp" android:gravity="left" android:padding="3dip"
+			/>
+		<EditText android:id="@+id/addc_group"  android:inputType="text"
+			android:textSize="16sp" android:minWidth="250dp"
+			android:scrollHorizontally="true" 
+			android:padding="3dip"
+			/>
+	</TableRow>
 	<Button android:id="@+id/addc_ok" android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
 		android:text="@string/AddCOkButton">
 		<requestFocus />
 	</Button>
-</LinearLayout>
\ No newline at end of file
+</TableLayout>
\ No newline at end of file
diff -r 5efd53751e9e -r f930c6558d37 res/layout/sendim.xml
--- a/res/layout/sendim.xml	Fri Jun 26 18:57:17 2009 +0200
+++ b/res/layout/sendim.xml	Fri Jun 26 19:50:23 2009 +0200
@@ -28,31 +28,6 @@
 		</LinearLayout>
 	</LinearLayout>
 
-	<!--
-		<LinearLayout android:paddingLeft="5px" android:paddingTop="5px"
-		android:background="@drawable/beem_sendim_header_1"
-		android:orientation="horizontal" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:layout_weight="4">
-
-		<ImageView android:id="@+id/sendimavatar"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" android:maxHeight="80px"
-		android:layout_weight="5" android:src="@drawable/background"/>
-
-		<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="fill_parent" android:layout_weight="1"
-		android:orientation="vertical"> <TextView
-		android:id="@+id/sendimlogin" android:paddingLeft="15px"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:hint="@string/SendIMLoginHint"/> <TextView
-		android:id="@+id/sendimstatus" android:paddingLeft="20px"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:hint="@string/SendIMNoStatusSet"/> </LinearLayout>
-		</LinearLayout>
-	-->
-
 	<ScrollView android:id="@+id/sendimscroll"
 		android:layout_width="fill_parent" android:layout_height="fill_parent"
 		android:scrollbarTrackVertical="@drawable/scrollbar_vertical_track"