Added new icons from android-15 sdk. Made load and save action bar items show up...

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@792 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/res/drawable-hdpi/ic_menu_add.png b/android/res/drawable-hdpi/ic_menu_add.png
new file mode 100644 (file)
index 0000000..444e8a5
Binary files /dev/null and b/android/res/drawable-hdpi/ic_menu_add.png differ

diff --git a/android/res/drawable-hdpi/ic_menu_archive.png b/android/res/drawable-hdpi/ic_menu_archive.png
new file mode 100644 (file)
index 0000000..e2d9bc1
Binary files /dev/null and b/android/res/drawable-hdpi/ic_menu_archive.png differ

diff --git a/android/res/drawable-hdpi/ic_menu_info_details.png b/android/res/drawable-hdpi/ic_menu_info_details.png
new file mode 100644 (file)
index 0000000..6a7a1e9
Binary files /dev/null and b/android/res/drawable-hdpi/ic_menu_info_details.png differ

diff --git a/android/res/drawable-hdpi/ic_menu_preferences.png b/android/res/drawable-hdpi/ic_menu_preferences.png
new file mode 100644 (file)
index 0000000..5321f82
Binary files /dev/null and b/android/res/drawable-hdpi/ic_menu_preferences.png differ

diff --git a/android/res/drawable-hdpi/ic_menu_save.png b/android/res/drawable-hdpi/ic_menu_save.png
new file mode 100644 (file)
index 0000000..36fc7f4
Binary files /dev/null and b/android/res/drawable-hdpi/ic_menu_save.png differ

diff --git a/android/res/drawable-ldpi/ic_menu_add.png b/android/res/drawable-ldpi/ic_menu_add.png
new file mode 100644 (file)
index 0000000..89620af
Binary files /dev/null and b/android/res/drawable-ldpi/ic_menu_add.png differ

diff --git a/android/res/drawable-ldpi/ic_menu_archive.png b/android/res/drawable-ldpi/ic_menu_archive.png
new file mode 100644 (file)
index 0000000..719ecd8
Binary files /dev/null and b/android/res/drawable-ldpi/ic_menu_archive.png differ

diff --git a/android/res/drawable-ldpi/ic_menu_info_details.png b/android/res/drawable-ldpi/ic_menu_info_details.png
new file mode 100644 (file)
index 0000000..55c57d5
Binary files /dev/null and b/android/res/drawable-ldpi/ic_menu_info_details.png differ

diff --git a/android/res/drawable-ldpi/ic_menu_preferences.png b/android/res/drawable-ldpi/ic_menu_preferences.png
new file mode 100644 (file)
index 0000000..efc2f3e
Binary files /dev/null and b/android/res/drawable-ldpi/ic_menu_preferences.png differ

diff --git a/android/res/drawable-ldpi/ic_menu_save.png b/android/res/drawable-ldpi/ic_menu_save.png
new file mode 100644 (file)
index 0000000..ac053b4
Binary files /dev/null and b/android/res/drawable-ldpi/ic_menu_save.png differ

diff --git a/android/res/drawable-mdpi/ic_menu_add.png b/android/res/drawable-mdpi/ic_menu_add.png
new file mode 100644 (file)
index 0000000..361c7c4
Binary files /dev/null and b/android/res/drawable-mdpi/ic_menu_add.png differ

diff --git a/android/res/drawable-mdpi/ic_menu_archive.png b/android/res/drawable-mdpi/ic_menu_archive.png
new file mode 100644 (file)
index 0000000..49ac569
Binary files /dev/null and b/android/res/drawable-mdpi/ic_menu_archive.png differ

diff --git a/android/res/drawable-mdpi/ic_menu_info_details.png b/android/res/drawable-mdpi/ic_menu_info_details.png
new file mode 100644 (file)
index 0000000..18b15b5
Binary files /dev/null and b/android/res/drawable-mdpi/ic_menu_info_details.png differ

diff --git a/android/res/drawable-mdpi/ic_menu_preferences.png b/android/res/drawable-mdpi/ic_menu_preferences.png
new file mode 100644 (file)
index 0000000..ccc50e6
Binary files /dev/null and b/android/res/drawable-mdpi/ic_menu_preferences.png differ

diff --git a/android/res/drawable-mdpi/ic_menu_save.png b/android/res/drawable-mdpi/ic_menu_save.png
new file mode 100644 (file)
index 0000000..5f66864
Binary files /dev/null and b/android/res/drawable-mdpi/ic_menu_save.png differ

diff --git a/android/res/drawable-xhdpi/ic_menu_add.png b/android/res/drawable-xhdpi/ic_menu_add.png
new file mode 100644 (file)
index 0000000..7d498a9
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_menu_add.png differ

diff --git a/android/res/drawable-xhdpi/ic_menu_archive.png b/android/res/drawable-xhdpi/ic_menu_archive.png
new file mode 100644 (file)
index 0000000..b1be9d5
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_menu_archive.png differ

diff --git a/android/res/drawable-xhdpi/ic_menu_info_details.png b/android/res/drawable-xhdpi/ic_menu_info_details.png
new file mode 100644 (file)
index 0000000..24ea543
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_menu_info_details.png differ

diff --git a/android/res/drawable-xhdpi/ic_menu_preferences.png b/android/res/drawable-xhdpi/ic_menu_preferences.png
new file mode 100644 (file)
index 0000000..02cfbad
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_menu_preferences.png differ

diff --git a/android/res/drawable-xhdpi/ic_menu_save.png b/android/res/drawable-xhdpi/ic_menu_save.png
new file mode 100644 (file)
index 0000000..62a66d8
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_menu_save.png differ

diff --git a/android/res/drawable/ic_menu_preferences.png b/android/res/drawable/ic_menu_preferences.png
deleted file mode 100644 (file)
index b8e7141..0000000
Binary files a/android/res/drawable/ic_menu_preferences.png and /dev/null differ

diff --git a/android/res/menu/main_menu.xml b/android/res/menu/main_menu.xml
index 07b8f1ad20c2da247e8c9684ae7e7cd07371f99a..51fc89f9e9c606cfb270b8463074f3e5df21c560 100644 (file)
--- a/android/res/menu/main_menu.xml
+++ b/android/res/menu/main_menu.xml
@@ -10,6 +10,7 @@
     <item\r
         android:id="@+id/menu_about"\r
         android:title="@string/About"\r
+        android:icon="@drawable/ic_menu_info_details"\r
         android:showAsAction="never"/>\r
 \r
 </menu>
\ No newline at end of file

diff --git a/android/res/menu/motor_browser_option_menu.xml b/android/res/menu/motor_browser_option_menu.xml
index 23ad3760ce8615acaf9fa6923348764e1cfafb8b..1cb66fb058580a380479ef3d5dbc9131aba82757 100644 (file)
--- a/android/res/menu/motor_browser_option_menu.xml
+++ b/android/res/menu/motor_browser_option_menu.xml
@@ -10,6 +10,7 @@
         android:title="@string/Preferences"/>
     <item
         android:id="@+id/menu_about"
+        android:icon="@drawable/ic_menu_info_details"
         android:showAsAction="never"
         android:title="@string/About"/>
 

diff --git a/android/res/menu/rocket_viewer_configurations_option_menu.xml b/android/res/menu/rocket_viewer_configurations_option_menu.xml
index dc83f50ac557f538bea357678b269c9ef2bc96be..e87042586b520633f9ef8b07b0cd211263d0660a 100644 (file)
--- a/android/res/menu/rocket_viewer_configurations_option_menu.xml
+++ b/android/res/menu/rocket_viewer_configurations_option_menu.xml
@@ -2,8 +2,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >\r
 \r
     <item\r
-        android:orderInCategory="0"\r
         android:id="@+id/menu_add"\r
+        android:icon="@drawable/ic_menu_add"\r
+        android:orderInCategory="0"\r
         android:showAsAction="always"\r
         android:title="@string/Add"/>\r
 \r

diff --git a/android/res/menu/rocket_viewer_option_menu.xml b/android/res/menu/rocket_viewer_option_menu.xml
index 35f58532951f9fe61da46aad13154b823602b8b6..906f539db484a67981b9b8a44376abbdfa81ebf0 100644 (file)
--- a/android/res/menu/rocket_viewer_option_menu.xml
+++ b/android/res/menu/rocket_viewer_option_menu.xml
@@ -3,14 +3,20 @@
 \r
     <item\r
         android:id="@+id/menu_load"\r
+        android:icon="@drawable/ic_menu_archive"\r
+        android:orderInCategory="0"\r
+        android:showAsAction="always"\r
         android:title="@string/load"/>\r
     <item\r
         android:id="@+id/menu_save"\r
+        android:icon="@drawable/ic_menu_save"\r
+        android:orderInCategory="0"\r
+        android:showAsAction="ifRoom"\r
         android:title="@string/save"/>\r
     <item\r
-        android:orderInCategory="10"\r
         android:id="@+id/motor_list_menu_option"\r
         android:icon="@drawable/ic_motorbrowser"\r
+        android:orderInCategory="10"\r
         android:showAsAction="ifRoom"\r
         android:title="@string/viewmotorslabel"/>\r
     <item\r
@@ -20,6 +26,8 @@
     <item\r
         android:id="@+id/menu_about"\r
         android:showAsAction="never"\r
+                android:icon="@drawable/ic_menu_info_details"\r
+        \r
         android:title="@string/About"/>\r
 \r
 </menu>
\ No newline at end of file

diff --git a/android/res/menu/rocket_viewer_simulation_option_menu.xml b/android/res/menu/rocket_viewer_simulation_option_menu.xml
index dc83f50ac557f538bea357678b269c9ef2bc96be..e87042586b520633f9ef8b07b0cd211263d0660a 100644 (file)
--- a/android/res/menu/rocket_viewer_simulation_option_menu.xml
+++ b/android/res/menu/rocket_viewer_simulation_option_menu.xml
@@ -2,8 +2,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >\r
 \r
     <item\r
-        android:orderInCategory="0"\r
         android:id="@+id/menu_add"\r
+        android:icon="@drawable/ic_menu_add"\r
+        android:orderInCategory="0"\r
         android:showAsAction="always"\r
         android:title="@string/Add"/>\r
 \r