Merge branch 'master' into branch-1.6

9 files changed, 448 insertions, 25 deletions

diff --git a/altosdroid/res/layout/device_list.xml b/altosdroid/res/layout/device_list.xml
index bf295e4c..57e5501e 100644
--- a/altosdroid/res/layout/device_list.xml
+++ b/altosdroid/res/layout/device_list.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--
 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
+ Copyright © 2016 Keith Packard <keithp@keithp.com>
 
-          http://www.apache.org/licenses/LICENSE-2.0
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
diff --git a/altosdroid/res/layout/frequency.xml b/altosdroid/res/layout/frequency.xml
new file mode 100644
index 00000000..7f8d4041
--- /dev/null
+++ b/altosdroid/res/layout/frequency.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ Copyright © 2016 Keith Packard <keithp@keithp.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="horizontal"
+    >
+  <TextView
+      android:id="@+id/frequency"
+      android:layout_width="wrap_content"
+      android:layout_height="fill_parent"
+      android:padding="10dp"
+      android:layout_weight="1"
+      />
+</LinearLayout>
diff --git a/altosdroid/res/layout/idle_mode.xml b/altosdroid/res/layout/idle_mode.xml
new file mode 100644
index 00000000..d6a05fbb
--- /dev/null
+++ b/altosdroid/res/layout/idle_mode.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ Copyright © 2016 Keith Packard <keithp@keithp.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+      <TextView android:id="@+id/set_callsign_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/set_callsign_label"
+		/>
+      <EditText android:id="@+id/set_callsign"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:hint="@string/set_callsign_label"/>
+      <Button android:id="@+id/connect_idle"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/connect_idle"
+	      />
+      <Button android:id="@+id/disconnect_idle"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/disconnect_idle"
+	      />
+      <Button android:id="@+id/reboot_idle"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/reboot_idle"
+	      />
+      <Button android:id="@+id/igniters_idle"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/igniters_idle"
+	      />
+</LinearLayout>
diff --git a/altosdroid/res/layout/igniter_status.xml b/altosdroid/res/layout/igniter_status.xml
new file mode 100644
index 00000000..298f9155
--- /dev/null
+++ b/altosdroid/res/layout/igniter_status.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ Copyright © 2016 Keith Packard <keithp@keithp.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+-->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+  <TextView
+      android:id="@+id/igniter_status"
+      android:layout_width="wrap_content"
+      android:layout_height="fill_parent"
+      android:padding="10dp"
+      android:layout_alignParentRight="true"
+      />
+  <TextView
+      android:id="@+id/igniter_name"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"  
+      android:padding="10dp"
+      android:layout_alignParentLeft="@+id/igniter_status"
+      />
+</RelativeLayout>
diff --git a/altosdroid/res/layout/igniters.xml b/altosdroid/res/layout/igniters.xml
new file mode 100644
index 00000000..350a1e58
--- /dev/null
+++ b/altosdroid/res/layout/igniters.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ Copyright © 2016 Keith Packard <keithp@keithp.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+    <ListView android:id="@+id/igniters"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+	android:fadeScrollbars="false"
+	android:scrollbars="vertical"
+	android:choiceMode="singleChoice"
+	/>
+
+    <ToggleButton android:id="@+id/igniter_arm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textOn="@string/igniter_armed"
+            android:textOff="@string/igniter_arm"
+	    />
+    
+    <Button android:id="@+id/igniter_fire"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/igniter_fire"
+	    />
+    
+</LinearLayout>
diff --git a/altosdroid/res/layout/manage_frequencies.xml b/altosdroid/res/layout/manage_frequencies.xml
new file mode 100644
index 00000000..77ded1d9
--- /dev/null
+++ b/altosdroid/res/layout/manage_frequencies.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ Copyright © 2016 Keith Packard <keithp@keithp.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+    <LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/set_layout"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="horizontal"
+	>
+      <EditText
+	  android:id="@+id/set_frequency"
+	  android:layout_width="wrap_content"
+	  android:layout_height="fill_parent"
+	  android:padding="10dp"
+	  android:layout_weight="1"
+	  android:hint="@string/frequency"
+	  android:inputType="number|numberDecimal"/>
+      />
+      <TextView
+	  android:id="@+id/mhz"
+	  android:layout_width="wrap_content"
+	  android:layout_height="fill_parent"
+	  android:padding="10dp"
+	  android:layout_weight="0"
+	  android:text="@string/mhz"
+	  />
+      <EditText
+	  android:id="@+id/set_description"
+	  android:layout_width="wrap_content"
+	  android:layout_height="fill_parent"  
+	  android:padding="10dp"
+	  android:layout_weight="2"
+	  android:hint="@string/description"
+	  />
+    </LinearLayout>
+    <LinearLayout
+	android:orientation="horizontal"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	>
+      <Button android:id="@+id/set"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="@string/set"
+	      android:layout_weight="1"
+	      />
+      
+      <Button android:id="@+id/remove"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="@string/remove"
+	      android:layout_weight="1"
+	      />
+      
+      <Button android:id="@+id/done"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="@string/done"
+	      android:layout_weight="1"
+	      />
+    </LinearLayout>
+
+    <ListView android:id="@+id/frequencies"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+	android:fadeScrollbars="false"
+	android:scrollbars="vertical"
+	android:choiceMode="singleChoice"
+	/>
+
+    
+</LinearLayout>
diff --git a/altosdroid/res/layout/setup.xml b/altosdroid/res/layout/setup.xml
new file mode 100644
index 00000000..630378a1
--- /dev/null
+++ b/altosdroid/res/layout/setup.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ Copyright © 2016 Keith Packard <keithp@keithp.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+  <TableLayout
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:stretchColumns="2,3"
+      android:layout_weight="0"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content">
+
+    <TableRow
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+      <TextView
+	  android:id="@+id/select_rate_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/telemetry_rate"
+	  />
+      <Spinner android:id="@+id/select_rate"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/telemetry_rate"
+	       android:spinnerMode="dropdown"
+	       />
+    </TableRow>
+    <TableRow
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+      <TextView
+	  android:id="@+id/set_units_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/set_units"
+	  />
+      <Spinner android:id="@+id/set_units"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/set_units"
+	       android:spinnerMode="dropdown"
+	       />
+    </TableRow>
+    <TableRow
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+      <TextView
+	  android:id="@+id/map_type_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/map_type"
+	  />
+      <Spinner android:id="@+id/map_type"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/map_type"
+	       android:spinnerMode="dropdown"
+	       />
+    </TableRow>
+    <TableRow
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+      <TextView
+	  android:id="@+id/map_source_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/map_source"
+	  />
+      <Spinner android:id="@+id/map_source"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/map_source"
+	       android:spinnerMode="dropdown"
+	       />
+    </TableRow>
+  </TableLayout>
+  <Button android:id="@+id/preload_maps"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+	  android:text="@string/preload_maps"
+	  />
+  <Button android:id="@+id/manage_frequencies"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+	  android:text="@string/manage_frequencies"
+	  />
+  <Button android:id="@+id/done"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+	  android:text="@string/done"
+	  />
+</LinearLayout>
diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index 7e08c803..b2ca01a4 100644
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -25,27 +25,21 @@
     <item android:id="@+id/select_freq"
           android:icon="@android:drawable/ic_menu_preferences"
           android:title="@string/select_freq" />
-    <item android:id="@+id/select_rate"
-          android:icon="@android:drawable/ic_menu_preferences"
-          android:title="@string/select_rate" />
-    <item android:id="@+id/change_units"
-	  android:icon="@android:drawable/ic_menu_view"
-	  android:title="@string/change_units" />
-    <item android:id="@+id/preload_maps"
-	  android:icon="@android:drawable/ic_menu_mapmode"
-	  android:title="@string/preload_maps" />
-    <item android:id="@+id/map_type"
-	  android:icon="@android:drawable/ic_menu_mapmode"
-	  android:title="@string/map_type" />
-    <item android:id="@+id/map_source"
-	  android:icon="@android:drawable/ic_menu_mapmode"
-	  android:title="@string/map_source" />
+
     <item android:id="@+id/select_tracker"
 	  android:icon="@android:drawable/ic_menu_view"
 	  android:title="@string/select_tracker"/>
     <item android:id="@+id/delete_track"
 	  android:icon="@android:drawable/ic_notification_clear_all"
 	  android:title="@string/delete_track"/>
+
+    <item android:id="@+id/setup"
+          android:icon="@android:drawable/ic_menu_preferences"
+          android:title="@string/setup" />
+    <item android:id="@+id/idle_mode"
+          android:icon="@android:drawable/ic_menu_preferences"
+          android:title="@string/idle_mode" />
+
     <item android:id="@+id/quit"
           android:icon="@android:drawable/ic_menu_close_clear_cancel"
           android:title="@string/quit" />
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index e7014fc9..4380d62d 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -29,6 +29,7 @@
 	<string name="connect_device">Connect a device</string>
 	<string name="disconnect_device">Disconnect device</string>
 	<string name="quit">Quit</string>
+	<string name="setup">Setup</string>
 	<string name="select_freq">Select radio frequency</string>
 	<string name="select_rate">Select data rate</string>
 	<string name="change_units">Change units</string>
@@ -111,4 +112,35 @@
 	<string name="preload_radius">Radius</string>
 	
 	<string name="preload_load">Load Map</string>
+
+	<!-- Idle mode -->
+	<string name="idle_mode">Idle Mode</string>
+	<string name="set_callsign_label">Callsign</string>
+	<string name="connect_idle">Monitor</string>
+	<string name="disconnect_idle">Disconnect</string>
+	<string name="reboot_idle">Reboot</string>
+	<string name="igniters_idle">Fire Igniters</string>
+
+	<!-- igniters -->
+	<string name="igniters">Igniters</string>
+	<string name="igniter_arm">Arm</string>
+	<string name="igniter_armed">Armed</string>
+	<string name="igniter_fire">Fire</string>
+	
+	<!-- setup -->
+	<string name="telemetry_rate">Telemetry Rate</string>
+	<string name="set_units">Units</string>
+	<string name="map_type">Map Type</string>
+	<string name="map_source">Map Source</string>
+	<string name="preload_maps">Preload Maps</string>
+	<string name="manage_frequencies">Manage Frequencies</string>
+	<string name="done">OK</string>
+	
+	<!-- manage frequencies -->
+	<string name="set">Set</string>
+	<string name="mhz">MHz</string>
+	<string name="remove">Remove</string>
+	<string name="done">OK</string>
+	<string name="frequency">Frequency</string>
+	<string name="description">Description</string>
 </resources>