From 12f0c18049158f7ad7a010245de061df5b98d7be Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Wed, 29 Aug 2012 21:59:53 -0500
Subject: [PATCH] AndroidGCS: Check in some layouts for greater than 600px
 width

---
 androidgcs/res/layout-w600dp/gcs_home.xml | 106 ++++++++++++++++++++++
 androidgcs/res/layout-w600dp/tuning.xml   |  97 ++++++++++++++++++++
 2 files changed, 203 insertions(+)
 create mode 100644 androidgcs/res/layout-w600dp/gcs_home.xml
 create mode 100644 androidgcs/res/layout-w600dp/tuning.xml

diff --git a/androidgcs/res/layout-w600dp/gcs_home.xml b/androidgcs/res/layout-w600dp/gcs_home.xml
new file mode 100644
index 000000000..41ab95d42
--- /dev/null
+++ b/androidgcs/res/layout-w600dp/gcs_home.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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_controller"
+        android:layout_width="132dp"
+        android:layout_height="wrap_content"
+        android:layout_column="3"
+        android:layout_gravity="right"
+        android:layout_row="1"
+        android:layout_rowSpan="4"
+        android:background="@android:color/transparent"
+        android:drawableTop="@drawable/ic_controller"
+        android:text="@string/controller_name" />
+
+    <Button
+        android:id="@+id/launch_object_browser"
+        android:layout_width="132dp"
+        android:layout_height="wrap_content"
+        android:layout_column="0"
+        android:layout_gravity="right|bottom"
+        android:layout_row="2"
+        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_location"
+        android:layout_width="132dp"
+        android:layout_height="wrap_content"
+        android:layout_column="2"
+        android:layout_gravity="right|bottom"
+        android:layout_row="2"
+        android:layout_rowSpan="2"
+        android:background="@android:color/transparent"
+        android:drawableTop="@drawable/ic_map"
+        android:text="@string/location_name" />
+
+    <Button
+        android:id="@+id/launch_tuning"
+        android:layout_width="132dp"
+        android:layout_height="wrap_content"
+        android:layout_column="4"
+        android:layout_columnSpan="2"
+        android:layout_gravity="right|bottom"
+        android:layout_row="2"
+        android:layout_rowSpan="2"
+        android:background="@android:color/transparent"
+        android:drawableTop="@drawable/ic_tuning"
+        android:text="@string/tuning" />
+
+    <Button
+        android:id="@+id/launch_alarms"
+        android:layout_width="132dp"
+        android:layout_height="wrap_content"
+        android:layout_column="1"
+        android:layout_columnSpan="2"
+        android:layout_gravity="left|bottom"
+        android:layout_row="3"
+        android:layout_rowSpan="3"
+        android:background="@android:color/transparent"
+        android:drawableTop="@drawable/ic_alarms"
+        android:text="@string/alarms" />
+
+    <Button
+        android:id="@+id/launch_logger"
+        android:layout_width="132dp"
+        android:layout_height="wrap_content"
+        android:layout_column="3"
+        android:layout_gravity="left|bottom"
+        android:layout_row="3"
+        android:layout_rowSpan="3"
+        android:background="@android:color/transparent"
+        android:drawableTop="@drawable/ic_logging"
+        android:text="@string/logger_name" />
+
+    <Button
+        android:id="@+id/launch_pfd"
+        android:layout_width="132dp"
+        android:layout_height="wrap_content"
+        android:layout_column="0"
+        android:layout_gravity="left"
+        android:layout_row="5"
+        android:background="@android:color/transparent"
+        android:drawableTop="@drawable/ic_pfd"
+        android:text="@string/pfd_name" />
+
+
+    <Space
+        android:layout_width="1dp"
+        android:layout_height="32dp"
+        android:layout_column="0"
+        android:layout_row="0" />
+
+    <Space
+        android:layout_width="1dp"
+        android:layout_height="47dp"
+        android:layout_column="0"
+        android:layout_row="4" />
+
+</GridLayout>
\ No newline at end of file
diff --git a/androidgcs/res/layout-w600dp/tuning.xml b/androidgcs/res/layout-w600dp/tuning.xml
new file mode 100644
index 000000000..e69758a1b
--- /dev/null
+++ b/androidgcs/res/layout-w600dp/tuning.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:setting_attributes="http://schemas.android.com/apk/res/org.openpilot.androidgcs"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:orientation="vertical" >
+
+        <GridLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:stretchMode="columnWidth"
+            android:orientation="vertical" >
+		
+            <org.openpilot.androidgcs.views.ScrollBarView
+                android:id="@+id/rollRateKp"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_column="0"
+                android:layout_gravity="fill"
+                android:layout_row="0"
+                setting_attributes:max_value="0.01"
+                setting_attributes:setting_name="Roll Rate Kp" />
+
+            <org.openpilot.androidgcs.views.ScrollBarView
+                android:id="@+id/pitchRateKp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="1"
+                android:layout_row="0"
+                setting_attributes:setting_name="Pitch Rate Kp"
+                setting_attributes:max_value="0.01" />
+
+            <org.openpilot.androidgcs.views.ScrollBarView
+                android:id="@+id/rollRateKi"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="0"
+                android:layout_row="1"
+                setting_attributes:setting_name="Roll Rate Ki"
+                setting_attributes:max_value="0.05" />
+
+            <org.openpilot.androidgcs.views.ScrollBarView
+                android:id="@+id/pitchRateKi"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="1"
+                android:layout_row="1"
+                setting_attributes:setting_name="Pitch Rate Ki"
+                setting_attributes:max_value="0.05" />
+
+            <org.openpilot.androidgcs.views.ScrollBarView
+                android:id="@+id/rollKp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="0"
+                android:layout_row="2"
+                setting_attributes:setting_name="Roll Kp"
+                setting_attributes:max_value="5" />
+
+            <org.openpilot.androidgcs.views.ScrollBarView
+                android:id="@+id/pitchKp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="1"
+                android:layout_row="2"
+                setting_attributes:setting_name="Pitch Kp"
+                setting_attributes:max_value="5" />
+        </GridLayout>
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="right" >
+
+        <Button
+            android:id="@+id/applyBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/apply" />
+
+        <Button
+            android:id="@+id/saveBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/save" />
+
+    </LinearLayout>
+</LinearLayout>
+