AndroidGCS: Clean up start page and improve the icons.

androidgcs/AndroidManifest.xml

@@ -9,7 +9,7 @@
 	<uses-permission android:name="android.permission.BLUETOOTH" />
 	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
-	<application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Holo">
+	<application android:icon="@drawable/ic_logo" android:label="@string/app_name" android:theme="@android:style/Theme.Holo">
 		<!-- for map overlay -->
 		<uses-library android:name="com.google.android.maps" />
 
@@ -21,11 +21,11 @@
 			</intent-filter>
 		</activity>
 
-
 		<activity android:name="ObjectBrowser" android:label="@string/object_browser_name" />
 		<activity android:name="PFD" android:label="PFD" />
+		<activity android:name="Controller" android:label="@string/object_browser_name" />
 		<activity android:name="Preferences" android:label="@string/preference_title" />
-		<activity android:name="UAVLocation" android:label="@string/location_name" />
+		<activity android:name="UAVLocation" android:label="@string/location_name"/>
 		<activity android:name="ObjectEditor" android:label="ObjectEditor"
 			android:theme="@android:style/Theme.Dialog" />
 

androidgcs/res/layout/gcs_home.xml

@@ -1,37 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentLeft="true"
+    android:layout_gravity="center_horizontal" >
 
     <Button
         android:id="@+id/launch_object_browser"
-        android:layout_width="wrap_content"
+        android:layout_width="132dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:drawableLeft="@drawable/browser_icon"
+        android:layout_column="0"
+        android:layout_gravity="center"
+        android:layout_row="0"
+        android:layout_rowSpan="2"
+        android:background="@android:color/transparent"
+        android:drawableTop="@drawable/ic_browser"
         android:text="@string/object_browser_name" />
 
     <Button
-        android:id="@+id/launch_pfd"
-        android:layout_width="wrap_content"
+        android:id="@+id/launch_location"
+        android:layout_width="132dp"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/launch_object_browser"
-        android:layout_alignRight="@+id/launch_object_browser"
-        android:layout_below="@+id/launch_object_browser"
-        android:drawableLeft="@drawable/browser_icon"
-        android:text="@string/pfd_name" >
-    </Button>
+        android:layout_column="1"
+        android:layout_gravity="center"
+        android:layout_row="0"
+        android:layout_rowSpan="2"
+        android:background="@android:color/transparent"
+        android:drawableTop="@drawable/ic_map"
+        android:text="@string/location_name" />
 
     <Button
-        android:id="@+id/launch_location"
-        android:layout_width="wrap_content"
+        android:id="@+id/launch_pfd"
+        android:layout_width="132dp"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/launch_object_browser"
-        android:layout_alignRight="@+id/launch_object_browser"
-        android:layout_below="@+id/launch_pfd"
-        android:drawableLeft="@drawable/browser_icon"
-        android:text="@string/location_name" >
-    </Button>
+        android:layout_column="2"
+        android:layout_gravity="center"
+        android:layout_row="0"
+        android:layout_rowSpan="2"
+        android:background="@android:color/transparent"
+        android:drawableTop="@drawable/ic_pfd"
+        android:text="@string/pfd_name" />
 
-</RelativeLayout>
+    <Button
+        android:id="@+id/launch_controller"
+        android:layout_width="132dp"
+        android:layout_height="wrap_content"
+        android:layout_column="0"
+        android:layout_gravity="right"
+        android:layout_row="2"
+        android:layout_rowSpan="2"
+        android:background="@android:color/transparent"
+        android:drawableTop="@drawable/ic_controller"
+        android:text="@string/controller_name" />
+
+    <Button
+        android:id="@+id/launch_logger"
+        android:layout_width="132dp"
+        android:layout_height="wrap_content"
+        android:layout_column="1"
+        android:layout_gravity="right"
+        android:layout_row="2"
+        android:layout_rowSpan="2"
+        android:background="@android:color/transparent"
+        android:drawableTop="@drawable/ic_logging"
+        android:text="@string/logger_name" />
+    
+    <Space
+        android:layout_width="1dp"
+        android:layout_height="32dp"
+        android:layout_column="0"
+        android:layout_row="0" />
+
+    <Space
+        android:layout_width="100dp"
+        android:layout_height="69dp"
+        android:layout_row="1" />
+
+</GridLayout>

androidgcs/res/values/strings.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="app_name">OpenPilot GCS Home</string>
-	<string name="object_browser_name">OpenPilot Object Browser</string>
-	<string name="pfd_name">OpenPilot PFD</string>
-	<string name="location_name">OpenPilot Location</string>
+	<string name="object_browser_name">Browser</string>
+	<string name="pfd_name">PFD</string>
+	<string name="location_name">Map</string>
+	<string name="logger_name">Logging</string>
 	
 	<string name="menu_item_settings">Settings</string>
 	<string name="menu_item_connect">Connect</string>
@@ -24,4 +25,6 @@
 	<string name="update_button">Update</string>
 	<string name="save_button">Save</string>
 	<string name="send_button">Send</string>
+	<string name="controller_name">Controller</string>
+	<string name="manual_control_values_">Manual control values:</string>
 </resources>

androidgcs/src/org/openpilot/androidgcs/HomePage.java

@@ -33,6 +33,14 @@ public class HomePage extends ObjectManagerActivity {
 				startActivity(new Intent(HomePage.this, UAVLocation.class));	
 			}			
 		});
+
+		Button controller = (Button) findViewById(R.id.launch_controller);
+		controller.setOnClickListener(new OnClickListener() {
+			public void onClick(View arg0) {
+				startActivity(new Intent(HomePage.this, Controller.class));	
+			}			
+		});
+
 	}
 
 }