From f5db885d7c95b85787c0debd46f0db3ae7e87438 Mon Sep 17 00:00:00 2001
From: Bananeweizen <Bananeweizen@gmx.de>
Date: Wed, 28 Dec 2011 22:07:53 +0100
Subject: refactoring: some lint fixes

---
 main/res/layout/about.xml               |   7 --
 main/res/layout/auth.xml                |   4 -
 main/res/layout/cacheview_logs_img.xml  |   2 -
 main/res/layout/cacheview_logs_item.xml |   1 -
 main/res/layout/coords.xml              |   6 +-
 main/res/layout/helpers.xml             |   4 -
 main/res/layout/init.xml                |  35 ------
 main/res/layout/navigate.xml            |   3 +-
 main/res/layout/search.xml              | 185 ++++++++++++++++----------------
 main/res/layout/simple_way_point.xml    |   2 +-
 main/res/layout/touch.xml               |   7 +-
 main/res/layout/visit.xml               |   8 +-
 main/res/layout/visit_trackable.xml     |   3 -
 13 files changed, 98 insertions(+), 169 deletions(-)

diff --git a/main/res/layout/about.xml b/main/res/layout/about.xml
index 6584ad4..e760de3 100644
--- a/main/res/layout/about.xml
+++ b/main/res/layout/about.xml
@@ -39,7 +39,6 @@
 						android:layout_marginLeft="10dip"
 						android:layout_marginRight="10dip"
 						android:layout_marginTop="5dip"
-						android:layout_alignParentLeft="true"
 						android:layout_gravity="left"
 						android:textSize="14dip"
 						android:textColor="?text_color"
@@ -50,7 +49,6 @@
 						android:layout_marginLeft="10dip"
 						android:layout_marginRight="10dip"
 						android:layout_marginBottom="5dip"
-						android:layout_alignParentRight="true"
 						android:layout_gravity="right"
 						android:textSize="14dip"
 						android:textColor="?text_color"
@@ -109,7 +107,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentRight="true"
 					android:layout_gravity="left"
 					android:textSize="14dip"
 					android:textColor="?text_color"
@@ -125,7 +122,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentRight="true"
 					android:layout_gravity="left"
 					android:textSize="14dip"
 					android:textColor="?text_color"
@@ -141,7 +137,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentRight="true"
 					android:layout_gravity="left"
 					android:textSize="14dip"
 					android:textColor="?text_color"
@@ -157,7 +152,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentRight="true"
 					android:layout_gravity="left"
 					android:textSize="14dip"
 					android:textColor="?text_color"
@@ -173,7 +167,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentRight="true"
 					android:layout_gravity="left"
 					android:textSize="14dip"
 					android:textColor="?text_color"
diff --git a/main/res/layout/auth.xml b/main/res/layout/auth.xml
index ff4cc2f..51c7d03 100644
--- a/main/res/layout/auth.xml
+++ b/main/res/layout/auth.xml
@@ -31,8 +31,6 @@
 						android:maxWidth="64dip"
 						android:maxHeight="64dip"
 						android:scaleType="fitXY"
-						android:layout_alignParentTop="true"
-						android:layout_alignParentLeft="true"
 						android:layout_marginTop="7dip"
 						android:layout_marginBottom="7dip"
 						android:layout_marginLeft="7dip"
@@ -44,7 +42,6 @@
 						android:layout_marginLeft="10dip"
 						android:layout_marginRight="10dip"
 						android:layout_marginBottom="5dip"
-						android:layout_alignParentRight="true"
 						android:layout_gravity="left|center_vertical"
 						android:gravity="left|center_vertical"
 						android:textSize="14dip"
@@ -57,7 +54,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentRight="true"
 					android:layout_gravity="left|center_vertical"
 					android:gravity="left|center_vertical"
 					android:textSize="14dip"
diff --git a/main/res/layout/cacheview_logs_img.xml b/main/res/layout/cacheview_logs_img.xml
index 2db45c6..0e3fabc 100644
--- a/main/res/layout/cacheview_logs_img.xml
+++ b/main/res/layout/cacheview_logs_img.xml
@@ -5,10 +5,8 @@
 	  android:layout_height="match_parent">
     <TextView
     	android:id="@+id/title"
-    	android:text="Photo"
     	android:layout_width="wrap_content"
     	android:layout_height="wrap_content"
-    	android:layout_alignParentTop="true"
 		android:layout_gravity="left|top"
         android:drawableLeft="?log_img_icon"
         android:drawablePadding="3dip"
diff --git a/main/res/layout/cacheview_logs_item.xml b/main/res/layout/cacheview_logs_item.xml
index 6aca7a4..d9514e9 100644
--- a/main/res/layout/cacheview_logs_item.xml
+++ b/main/res/layout/cacheview_logs_item.xml
@@ -66,7 +66,6 @@
 		<ImageView android:id="@+id/log_mark"
 				android:layout_width="2dip"
 				android:layout_height="fill_parent"
-				android:layout_centerVertical="true"
 				android:layout_marginTop="2dip"
 				android:layout_marginBottom="2dip"
 				android:scaleType="fitXY"
diff --git a/main/res/layout/coords.xml b/main/res/layout/coords.xml
index 3291966..fdf7f49 100644
--- a/main/res/layout/coords.xml
+++ b/main/res/layout/coords.xml
@@ -31,8 +31,7 @@
 		            android:layout_weight="1">
 		        <TableRow android:id="@+id/tableRow1">
 		            <Button android:id="@+id/ButtonLat"
-		                    style="@style/button"
-		                    android:text="N" />
+		                    style="@style/button"/>
 		            <EditText style="@style/edittext"
 		                    android:id="@+id/EditTextLatDeg"
 		                    android:gravity="right"
@@ -61,8 +60,7 @@
 		        </TableRow>
 		        <TableRow android:id="@+id/tableRow2">
 		            <Button android:id="@+id/ButtonLon"
-		                    style="@style/button"
-		                    android:text="E" />
+		                    style="@style/button"/>
 		            <EditText android:id="@+id/EditTextLonDeg"
 		                    style="@style/edittext"
 		                    android:gravity="right"
diff --git a/main/res/layout/helpers.xml b/main/res/layout/helpers.xml
index aa43adf..a08d9eb 100644
--- a/main/res/layout/helpers.xml
+++ b/main/res/layout/helpers.xml
@@ -49,7 +49,6 @@
 					<TextView
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="3dip"
 							android:textSize="14dip"
@@ -89,7 +88,6 @@
 					<TextView
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="3dip"
 							android:textSize="14dip"
@@ -129,7 +127,6 @@
 					<TextView
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="3dip"
 							android:textSize="14dip"
@@ -169,7 +166,6 @@
 					<TextView
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="3dip"
 							android:textSize="14dip"
diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index 1997dbc..4c65c49 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -36,7 +36,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentLeft="true"
 					android:layout_gravity="left"
 					android:padding="3dip"
 					android:textSize="14dip"
@@ -79,7 +78,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentLeft="true"
 					android:layout_gravity="left"
 					android:padding="3dip"
 					android:textSize="14dip"
@@ -96,7 +94,6 @@
 				<CheckBox android:id="@+id/publicloc"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_alignParentLeft="true"
 						android:layout_gravity="left"
 						android:padding="1px"
 						android:gravity="center" />
@@ -122,7 +119,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentLeft="true"
 					android:layout_gravity="left"
 					android:padding="3dip"
 					android:textSize="14dip"
@@ -142,7 +138,6 @@
 				<CheckBox android:id="@+id/twitter_option"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_alignParentLeft="true"
 						android:layout_gravity="left"
 						android:padding="1px"
 						android:gravity="center" />
@@ -182,7 +177,6 @@
 						android:id="@+id/signature_help"
 						android:layout_width="wrap_content"
 						android:layout_weight="1"
-						android:layout_alignParentRight="true"
 						android:textSize="14dip"
 						android:text="@string/init_signature_help_button" />
 			</LinearLayout>
@@ -195,7 +189,6 @@
                 <CheckBox android:id="@+id/sigautoinsert"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
                         android:layout_gravity="left"
                         android:padding="1px"
                         android:gravity="center" />
@@ -223,7 +216,6 @@
 					<CheckBox android:id="@+id/autoload"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -244,7 +236,6 @@
 					<CheckBox android:id="@+id/ratingwanted"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -265,7 +256,6 @@
 					<CheckBox android:id="@+id/elevationwanted"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -287,7 +277,6 @@
                         android:id="@+id/friendlogswanted"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
                         android:layout_gravity="left"
                         android:gravity="center"
                         android:padding="1px" />
@@ -308,7 +297,6 @@
                     <CheckBox android:id="@+id/openlastdetailspage"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_alignParentLeft="true"
                             android:layout_gravity="left"
                             android:padding="1px"
                             android:gravity="center" />
@@ -342,7 +330,6 @@
 					<CheckBox android:id="@+id/skin"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -363,7 +350,6 @@
 					<CheckBox android:id="@+id/address"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -384,7 +370,6 @@
 					<CheckBox android:id="@+id/captcha"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -405,7 +390,6 @@
                     <CheckBox android:id="@+id/loaddirectionimg"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_alignParentLeft="true"
                             android:layout_gravity="left"
                             android:padding="1px"
                             android:gravity="center" />
@@ -426,7 +410,6 @@
 					<CheckBox android:id="@+id/useenglish"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -447,7 +430,6 @@
 					<CheckBox android:id="@+id/exclude"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -468,7 +450,6 @@
 					<CheckBox android:id="@+id/disabled"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -489,7 +470,6 @@
                     <CheckBox android:id="@+id/trackautovisit"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_alignParentLeft="true"
                             android:layout_gravity="left"
                             android:padding="1px"
                             android:gravity="center" />
@@ -510,7 +490,6 @@
 					<CheckBox android:id="@+id/offline"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -531,7 +510,6 @@
 					<CheckBox android:id="@+id/save_log_img"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -552,7 +530,6 @@
 					<CheckBox android:id="@+id/units"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -573,7 +550,6 @@
 					<CheckBox android:id="@+id/gnav"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -594,7 +570,6 @@
 					<CheckBox android:id="@+id/livelist"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -615,7 +590,6 @@
 					<CheckBox android:id="@+id/log_offline"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -636,7 +610,6 @@
 					<CheckBox android:id="@+id/browser"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -657,7 +630,6 @@
 					<CheckBox android:id="@+id/trail"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -690,7 +662,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentLeft="true"
 					android:layout_gravity="left"
 					android:padding="3dip"
 					android:textSize="14dip"
@@ -710,7 +681,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentLeft="true"
 					android:layout_gravity="left"
 					android:padding="3dip"
 					android:textSize="14dip"
@@ -756,7 +726,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentLeft="true"
 					android:layout_gravity="left"
 					android:padding="3dip"
 					android:textSize="14dip"
@@ -776,7 +745,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentLeft="true"
 					android:layout_gravity="left"
 					android:padding="3dip"
 					android:textSize="14dip"
@@ -797,7 +765,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentLeft="true"
 					android:layout_gravity="left"
 					android:padding="3dip"
 					android:textSize="14dip"
@@ -820,7 +787,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentLeft="true"
 					android:layout_gravity="left"
 					android:padding="3dip"
 					android:textSize="14dip"
@@ -853,7 +819,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentLeft="true"
 					android:layout_gravity="left"
 					android:padding="3dip"
 					android:textSize="14dip"
diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml
index 36b8674..58c1f93 100644
--- a/main/res/layout/navigate.xml
+++ b/main/res/layout/navigate.xml
@@ -24,8 +24,7 @@
 				android:layout_centerHorizontal="true"
 				android:layout_gravity="center"
 				android:textSize="14dip"
-				android:textColor="?text_color"
-				android:text="destination" />
+				android:textColor="?text_color"/>
 		<TextView android:id="@+id/heading"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
diff --git a/main/res/layout/search.xml b/main/res/layout/search.xml
index f433ede..82fdac6 100644
--- a/main/res/layout/search.xml
+++ b/main/res/layout/search.xml
@@ -23,108 +23,103 @@
 				android:layout_width="fill_parent"
 				android:layout_height="fill_parent"
 				android:layout_marginTop="10dip"
+                android:layout_marginBottom="10dip"
 				android:orientation="vertical" >
-			<LinearLayout
-					android:layout_width="fill_parent"
-					android:layout_height="fill_parent"
-					android:layout_marginBottom="10dip"
-					android:orientation="vertical" >
-				<RelativeLayout style="@style/separator_horizontal_layout" >
-					<View style="@style/separator_horizontal" />
-					<TextView style="@style/separator_horizontal_headline"
-							android:text="@string/search_coordinates" />
-				</RelativeLayout>
-				<Button style="@style/button" 
-					android:hint="@string/latitude"
-					android:id="@+id/buttonLatitude"/>
-				<Button style="@style/button" 
-					android:hint="@string/longitude"
-					android:id="@+id/buttonLongitude"/>
-				<Button style="@style/button"
-						android:id="@+id/search_coordinates"
-						android:text="@string/search_coordinates_button" />
+			<RelativeLayout style="@style/separator_horizontal_layout" >
+				<View style="@style/separator_horizontal" />
+				<TextView style="@style/separator_horizontal_headline"
+						android:text="@string/search_coordinates" />
+			</RelativeLayout>
+			<Button style="@style/button" 
+				android:hint="@string/latitude"
+				android:id="@+id/buttonLatitude"/>
+			<Button style="@style/button" 
+				android:hint="@string/longitude"
+				android:id="@+id/buttonLongitude"/>
+			<Button style="@style/button"
+					android:id="@+id/search_coordinates"
+					android:text="@string/search_coordinates_button" />
 <!-- ** -->
-				<RelativeLayout style="@style/separator_horizontal_layout" >
-					<View style="@style/separator_horizontal" />
-					<TextView style="@style/separator_horizontal_headline"
-							android:text="@string/search_address" />
-				</RelativeLayout>
-				<EditText style="@style/edittext"
-						android:id="@+id/address"
-						android:hint="@string/search_address"
-						android:imeOptions="actionGo" />
-				<Button style="@style/button"
-						android:id="@+id/search_address"
-						android:text="@string/search_address_button" />
+			<RelativeLayout style="@style/separator_horizontal_layout" >
+				<View style="@style/separator_horizontal" />
+				<TextView style="@style/separator_horizontal_headline"
+						android:text="@string/search_address" />
+			</RelativeLayout>
+			<EditText style="@style/edittext"
+					android:id="@+id/address"
+					android:hint="@string/search_address"
+					android:imeOptions="actionGo" />
+			<Button style="@style/button"
+					android:id="@+id/search_address"
+					android:text="@string/search_address_button" />
 <!-- ** -->
-				<RelativeLayout style="@style/separator_horizontal_layout" >
-					<View style="@style/separator_horizontal" />
-					<TextView style="@style/separator_horizontal_headline"
-							android:text="@string/search_gc" />
-				</RelativeLayout>
-				<AutoCompleteTextView style="@style/edittext"
-						android:id="@+id/geocode"
-						android:hint="@string/search_gc"
-						android:imeOptions="actionGo"
-						android:text="GC"
-						android:inputType="textCapCharacters" />
-				<Button style="@style/button"
-						android:id="@+id/display_geocode"
-						android:text="@string/search_gc_button" />
+			<RelativeLayout style="@style/separator_horizontal_layout" >
+				<View style="@style/separator_horizontal" />
+				<TextView style="@style/separator_horizontal_headline"
+						android:text="@string/search_gc" />
+			</RelativeLayout>
+			<AutoCompleteTextView style="@style/edittext"
+					android:id="@+id/geocode"
+					android:hint="@string/search_gc"
+					android:imeOptions="actionGo"
+					android:text="GC"
+					android:inputType="textCapCharacters" />
+			<Button style="@style/button"
+					android:id="@+id/display_geocode"
+					android:text="@string/search_gc_button" />
 <!-- ** -->
-				<RelativeLayout style="@style/separator_horizontal_layout" >
-					<View style="@style/separator_horizontal" />
-					<TextView style="@style/separator_horizontal_headline"
-							android:text="@string/search_kw" />
-				</RelativeLayout>
-				<EditText style="@style/edittext"
-						android:id="@+id/keyword"
-						android:hint="@string/search_kw_prefill"
-						android:imeOptions="actionGo" />
-				<Button style="@style/button"
-						android:id="@+id/search_keyword"
-						android:text="@string/search_kw_button" />
+			<RelativeLayout style="@style/separator_horizontal_layout" >
+				<View style="@style/separator_horizontal" />
+				<TextView style="@style/separator_horizontal_headline"
+						android:text="@string/search_kw" />
+			</RelativeLayout>
+			<EditText style="@style/edittext"
+					android:id="@+id/keyword"
+					android:hint="@string/search_kw_prefill"
+					android:imeOptions="actionGo" />
+			<Button style="@style/button"
+					android:id="@+id/search_keyword"
+					android:text="@string/search_kw_button" />
 <!-- ** -->
-				<RelativeLayout style="@style/separator_horizontal_layout" >
-					<View style="@style/separator_horizontal" />
-					<TextView style="@style/separator_horizontal_headline"
-							android:text="@string/search_fbu" />
-				</RelativeLayout>
-				<EditText style="@style/edittext"
-						android:id="@+id/username"
-						android:hint="@string/search_fbu_prefill"
-						android:imeOptions="actionGo" />
-				<Button style="@style/button"
-						android:id="@+id/search_username"
-						android:text="@string/search_fbu_button" />
+			<RelativeLayout style="@style/separator_horizontal_layout" >
+				<View style="@style/separator_horizontal" />
+				<TextView style="@style/separator_horizontal_headline"
+						android:text="@string/search_fbu" />
+			</RelativeLayout>
+			<EditText style="@style/edittext"
+					android:id="@+id/username"
+					android:hint="@string/search_fbu_prefill"
+					android:imeOptions="actionGo" />
+			<Button style="@style/button"
+					android:id="@+id/search_username"
+					android:text="@string/search_fbu_button" />
 <!-- ** -->
-				<RelativeLayout style="@style/separator_horizontal_layout" >
-					<View style="@style/separator_horizontal" />
-					<TextView style="@style/separator_horizontal_headline"
-							android:text="@string/search_hbu" />
-				</RelativeLayout>
-				<EditText style="@style/edittext"
-						android:id="@+id/owner"
-						android:hint="@string/search_hbu_prefill"
-						android:imeOptions="actionGo" />
-				<Button style="@style/button"
-						android:id="@+id/search_owner"
-						android:text="@string/search_hbu_button" />
+			<RelativeLayout style="@style/separator_horizontal_layout" >
+				<View style="@style/separator_horizontal" />
+				<TextView style="@style/separator_horizontal_headline"
+						android:text="@string/search_hbu" />
+			</RelativeLayout>
+			<EditText style="@style/edittext"
+					android:id="@+id/owner"
+					android:hint="@string/search_hbu_prefill"
+					android:imeOptions="actionGo" />
+			<Button style="@style/button"
+					android:id="@+id/search_owner"
+					android:text="@string/search_hbu_button" />
 <!-- ** -->
-				<RelativeLayout style="@style/separator_horizontal_layout" >
-					<View style="@style/separator_horizontal" />
-					<TextView style="@style/separator_horizontal_headline"
-							android:text="@string/search_tb" />
-				</RelativeLayout>
-				<EditText style="@style/edittext"
-						android:id="@+id/trackable"
-						android:hint="@string/search_tb_hint"
-						android:imeOptions="actionGo"
-						android:inputType="textCapCharacters" />
-				<Button style="@style/button"
-						android:id="@+id/display_trackable"
-						android:text="@string/search_tb_button" />
-			</LinearLayout>
+			<RelativeLayout style="@style/separator_horizontal_layout" >
+				<View style="@style/separator_horizontal" />
+				<TextView style="@style/separator_horizontal_headline"
+						android:text="@string/search_tb" />
+			</RelativeLayout>
+			<EditText style="@style/edittext"
+					android:id="@+id/trackable"
+					android:hint="@string/search_tb_hint"
+					android:imeOptions="actionGo"
+					android:inputType="textCapCharacters" />
+			<Button style="@style/button"
+					android:id="@+id/display_trackable"
+					android:text="@string/search_tb_button" />
 		</LinearLayout>
 	</ScrollView>
 </LinearLayout>
diff --git a/main/res/layout/simple_way_point.xml b/main/res/layout/simple_way_point.xml
index ad7adb7..a1b7f33 100644
--- a/main/res/layout/simple_way_point.xml
+++ b/main/res/layout/simple_way_point.xml
@@ -20,6 +20,6 @@
 			android:textAppearance="?android:attr/textAppearanceSmall"
 			android:id="@+id/date" android:layout_width="wrap_content"
 			android:layout_alignParentRight="true" android:layout_alignParentTop="true"
-			android:text="date" android:layout_marginRight="10dp"></TextView>
+			android:layout_marginRight="10dp"></TextView>
 	</RelativeLayout>
 </LinearLayout>
diff --git a/main/res/layout/touch.xml b/main/res/layout/touch.xml
index 918d082..52378aa 100644
--- a/main/res/layout/touch.xml
+++ b/main/res/layout/touch.xml
@@ -38,13 +38,11 @@
 					<Button style="@style/button"
 							android:id="@+id/type"
 							android:layout_width="0dip"
-							android:layout_weight="1"
-							android:text="type" />
+							android:layout_weight="1"/>
 					<Button style="@style/button"
 							android:id="@+id/date"
 							android:layout_width="0dip"
-							android:layout_weight="1"
-							android:text="date" />
+							android:layout_weight="1"/>
 				</LinearLayout>
 				<EditText style="@style/edittext"
 						android:id="@+id/tracking"
@@ -67,7 +65,6 @@
 					<CheckBox android:id="@+id/tweet"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
diff --git a/main/res/layout/visit.xml b/main/res/layout/visit.xml
index c607a23..80a3a5c 100644
--- a/main/res/layout/visit.xml
+++ b/main/res/layout/visit.xml
@@ -38,13 +38,11 @@
 					<Button style="@style/button"
 							android:id="@+id/type"
 							android:layout_width="0dip"
-							android:layout_weight="1"
-							android:text="type" />
+							android:layout_weight="1"/>
 					<Button style="@style/button"
 							android:id="@+id/date"
 							android:layout_width="0dip"
-							android:layout_weight="1"
-							android:text="date" />
+							android:layout_weight="1"/>
 				</LinearLayout>
 				<EditText style="@style/edittext"
 						android:id="@+id/log"
@@ -64,7 +62,6 @@
 					<CheckBox android:id="@+id/tweet"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:layout_alignParentLeft="true"
 							android:layout_gravity="left"
 							android:padding="1px"
 							android:gravity="center" />
@@ -132,7 +129,6 @@
 							android:layout_marginLeft="10dip"
 							android:layout_marginRight="10dip"
 							android:layout_marginBottom="5dip"
-							android:layout_alignParentRight="true"
 							android:gravity="right"
 							android:textSize="14dip"
 							android:text="@string/log_tb_changeall" />
diff --git a/main/res/layout/visit_trackable.xml b/main/res/layout/visit_trackable.xml
index a9176dc..b4750cf 100644
--- a/main/res/layout/visit_trackable.xml
+++ b/main/res/layout/visit_trackable.xml
@@ -15,7 +15,6 @@
 		<TextView android:id="@+id/name"
 				android:layout_width="fill_parent"
 				android:layout_height="wrap_content"
-				android:layout_alignParentLeft="true"
 				android:layout_gravity="left"
 				android:gravity="left"
 				android:lines="1"
@@ -27,7 +26,6 @@
 		<TextView android:id="@+id/trackcode"
 				android:layout_width="fill_parent"
 				android:layout_height="wrap_content"
-				android:layout_alignParentLeft="true"
 				android:layout_gravity="left"
 				android:gravity="left"
 				android:lines="1"
@@ -41,7 +39,6 @@
 			android:layout_width="0dip"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:layout_alignParentRight="true"
 			android:layout_gravity="right"
 			android:gravity="right"
 			android:lines="1"
-- 
cgit v1.1