From 822b7df00ae7a4945a55bdcdefae62afe35cb0bd Mon Sep 17 00:00:00 2001
From: Jon Benson <hastarin+github@gmail.com>
Date: Tue, 7 May 2013 15:40:15 +1000
Subject: [PATCH] Changed various action items to "ifRoom" so they aren't
 forced.  Will be better on smaller displays.

---
 mobile/res/menu/main.xml | 74 +++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 42 deletions(-)

diff --git a/mobile/res/menu/main.xml b/mobile/res/menu/main.xml
index 06d7bdb8..390b957b 100644
--- a/mobile/res/menu/main.xml
+++ b/mobile/res/menu/main.xml
@@ -4,21 +4,21 @@
         android:id="@+id/menu_map"
         android:icon="@drawable/location_map"
         android:orderInCategory="20"
-        android:showAsAction="always"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_map">
     </item>
     <item
         android:id="@+id/menu_info"
         android:icon="@drawable/action_about"
         android:orderInCategory="30"
-        android:showAsAction="always"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_info">
     </item>
     <item
         android:id="@+id/menu_chat"
         android:icon="@drawable/social_group"
-        android:showAsAction="always"
         android:orderInCategory="35"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_chat">
         <menu>
             <item
@@ -55,48 +55,38 @@
         android:title="@string/locate">
     </item>
     <item
-        android:id="@+id/menu_settings"
+        android:id="@+id/reload_button"
+        android:icon="@drawable/navigation_refresh"
+        android:orderInCategory="110"
+        android:showAsAction="ifRoom"
+        android:title="@string/reload">
+    </item>
+    <item
+        android:id="@+id/toggle_fullscreen"
+        android:icon="@drawable/av_full_screen"
+        android:orderInCategory="120"
+        android:showAsAction="ifRoom"
+        android:title="@string/toggle_fullscreen">
+    </item>
+    <item
+        android:id="@+id/action_settings"
         android:icon="@drawable/action_settings"
         android:orderInCategory="130"
         android:showAsAction="ifRoom"
         android:title="@string/action_settings">
-        <menu>
-            <item
-                android:id="@+id/reload_button"
-                android:icon="@drawable/navigation_refresh"
-                android:orderInCategory="110"
-                android:showAsAction="ifRoom"
-                android:title="@string/reload">
-            </item>
-            <item
-                android:id="@+id/toggle_fullscreen"
-                android:icon="@drawable/av_full_screen"
-                android:orderInCategory="120"
-                android:showAsAction="ifRoom"
-                android:title="@string/toggle_fullscreen">
-            </item>
-            <item
-                android:id="@+id/action_settings"
-                android:icon="@drawable/action_settings"
-                android:orderInCategory="130"
-                android:showAsAction="ifRoom"
-                android:title="@string/action_settings">
-            </item>
-            <item
-                android:id="@+id/cache_clear"
-                android:icon="@drawable/content_remove"
-                android:orderInCategory="150"
-                android:showAsAction="never"
-                android:title="@string/cache_clear">
-            </item>
-            <item
-                android:id="@+id/menu_debug"
-                android:icon="@drawable/alerts_and_states_warning"
-                android:orderInCategory="190"
-                android:showAsAction="never"
-                android:title="@string/menu_debug">
-            </item>
-            </menu>
     </item>
-
+    <item
+        android:id="@+id/cache_clear"
+        android:icon="@drawable/content_remove"
+        android:orderInCategory="150"
+        android:showAsAction="never"
+        android:title="@string/cache_clear">
+    </item>
+    <item
+        android:id="@+id/menu_debug"
+        android:icon="@drawable/alerts_and_states_warning"
+        android:orderInCategory="190"
+        android:showAsAction="never"
+        android:title="@string/menu_debug">
+    </item>
 </menu>
\ No newline at end of file