diff options
| author | Robert Garbee <robert@gag.com> | 2015-06-13 17:40:59 -0600 |
|---|---|---|
| committer | Robert Garbee <robert@gag.com> | 2015-06-13 17:40:59 -0600 |
| commit | c46c2c5767c6e909fa58587e6c864a4fbaa9fa20 (patch) | |
| tree | 282e9152196bfc2ae66a2d5892f25811fa0e2c96 /altosdroid/res/values | |
| parent | 39f4361675aa13899864f427a33d4aa48be56cd2 (diff) | |
| parent | 6cb7d76c3fbe32b442713e358654d07b2506897e (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'altosdroid/res/values')
| -rw-r--r-- | altosdroid/res/values/Colors.xml | 20 | ||||
| -rw-r--r-- | altosdroid/res/values/CustomTheme.xml | 3 | ||||
| -rw-r--r-- | altosdroid/res/values/strings.xml | 2 |
3 files changed, 23 insertions, 2 deletions
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 --> |