Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

4 files changed, 32 insertions, 5 deletions

diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index 2109ae04..9cb57dfc 100644
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -22,9 +22,6 @@
     <item android:id="@+id/disconnect"
 	  android:icon="@android:drawable/ic_notification_clear_all"
 	  android:title="@string/disconnect_device" />
-    <item android:id="@+id/quit"
-          android:icon="@android:drawable/ic_menu_close_clear_cancel"
-          android:title="@string/quit" />
     <item android:id="@+id/select_freq"
           android:icon="@android:drawable/ic_menu_preferences"
           android:title="@string/select_freq" />
@@ -40,4 +37,13 @@
     <item android:id="@+id/map_type"
 	  android:icon="@android:drawable/ic_menu_mapmode"
 	  android:title="@string/map_type" />
+    <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/quit"
+          android:icon="@android:drawable/ic_menu_close_clear_cancel"
+          android:title="@string/quit" />
 </menu>
diff --git a/altosdroid/res/values/Colors.xml b/altosdroid/res/values/Colors.xml
new file mode 100644
index 00000000..055c6df2
--- /dev/null
+++ b/altosdroid/res/values/Colors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	 Copyright © 2015 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.
+-->
+<resources>
+  <color name="old_color">#ffff4040</color>
+</resources>
diff --git a/altosdroid/res/values/CustomTheme.xml b/altosdroid/res/values/CustomTheme.xml
index 4daed1f8..6c701ea2 100644
--- a/altosdroid/res/values/CustomTheme.xml
+++ b/altosdroid/res/values/CustomTheme.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <style name="CustomTheme" parent="android:Theme">
-    <item name="android:windowNoTitle">false</item>
+  <style name="CustomTheme" parent="android:Theme.Holo">
   </style>
 </resources>
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 1af0dbb7..79a77ba9 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -33,6 +33,8 @@
 	<string name="select_rate">Select data rate</string>
 	<string name="change_units">Change units</string>
 	<string name="preload_maps">Load Maps</string>
+	<string name="select_tracker">Select Tracker</string>
+	<string name="delete_track">Delete Track</string>
 	<string name="map_type">Map Type</string>
 
 	<!-- MapTypeActivity -->