From e2fdc9554053444d79ee839c7b2b6c0fb4825881 Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Wed, 29 Aug 2012 22:20:32 -0500
Subject: [PATCH] AndroidGCS: Use a relative layout for the object browser
 view.

---
 androidgcs/res/layout/object_browser.xml | 49 +++++++++---------------
 androidgcs/res/values/strings.xml        |  4 ++
 2 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/androidgcs/res/layout/object_browser.xml b/androidgcs/res/layout/object_browser.xml
index 8a7221fb6..faf875bfe 100644
--- a/androidgcs/res/layout/object_browser.xml
+++ b/androidgcs/res/layout/object_browser.xml
@@ -23,14 +23,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:checked="true"
-                android:text="Settings" />
+                android:text="@string/settings" />
 
             <CheckBox
                 android:id="@+id/dataCheck"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:checked="true"
-                android:text="Data" />
+                android:text="@string/data" />
 
         </LinearLayout>
         
@@ -56,7 +56,7 @@
                 android:layout_height="fill_parent"
                 android:background="#FFFFFFFF" />
 
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
@@ -66,40 +66,29 @@
                     android:id="@+id/object_information"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
                     android:layout_marginLeft="12dp"
                     android:layout_marginTop="12dp"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                <Space
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                <Button
+                    android:id="@+id/editButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentRight="true"
+                    android:text="@string/edit" />
 
-                <Space
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                <Button
+                    android:id="@+id/object_load_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_toLeftOf="@+id/editButton"
+                    android:text="@string/load" />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+            </RelativeLayout>
 
-                    <Button
-                        android:id="@+id/object_load_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="Load" />
-
-                    <Button
-                        android:id="@+id/editButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:layout_marginBottom="32dp"
-                        android:layout_marginRight="12dp"
-                        android:text="Edit" />
-
-                </LinearLayout>
-
-            </LinearLayout>
         </LinearLayout>
     </LinearLayout>
 
diff --git a/androidgcs/res/values/strings.xml b/androidgcs/res/values/strings.xml
index 93f404aed..1cc3c41f5 100644
--- a/androidgcs/res/values/strings.xml
+++ b/androidgcs/res/values/strings.xml
@@ -35,4 +35,8 @@
 	<string name="tuning">Tuning</string>
 	<string name="apply">Apply</string>
 	<string name="save">Save</string>
+	<string name="settings">Settings</string>
+	<string name="data">Data</string>
+	<string name="edit">Edit</string>
+	<string name="load">Load</string>
 </resources>