1 files changed, 26 insertions, 10 deletions
diff --git a/main/res/menu/main_activity_options.xml b/main/res/menu/main_activity_options.xml
index fc949dc..6e5a198 100644
--- a/main/res/menu/main_activity_options.xml
+++ b/main/res/menu/main_activity_options.xml
@@ -1,34 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
 
+    <!-- TODO: use ic_action_search -->
     <item
-        android:id="@+id/menu_settings"
-        android:icon="@drawable/ic_menu_preferences"
-        android:title="@string/menu_settings">
-    </item>
+        android:id="@+id/menu_gosearch"
+        style="@style/action_bar_action"
+        android:icon="@drawable/abc_ic_search"
+        android:title="@string/search_bar_hint"
+        cgeo:actionViewClass="android.support.v7.widget.SearchView"
+        cgeo:showAsAction="collapseActionView|always"/>
     <item
         android:id="@+id/menu_history"
         android:icon="@drawable/ic_menu_recent_history"
-        android:title="@string/menu_history">
+        android:title="@string/menu_history"
+        cgeo:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_pocket_queries"
         android:icon="@drawable/ic_menu_account_list"
-        android:title="@string/menu_pocket_queries">
+        android:title="@string/menu_pocket_queries"
+        cgeo:showAsAction="ifRoom">
+    </item>
+    <item
+        android:id="@+id/menu_settings"
+        android:icon="@drawable/ic_menu_preferences"
+        android:title="@string/menu_settings"
+        cgeo:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_helpers"
         android:icon="@drawable/ic_menu_shopping"
-        android:title="@string/menu_helpers">
+        android:title="@string/menu_helpers"
+        cgeo:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_scan"
         android:icon="@drawable/ic_menu_barcode"
-        android:title="@string/menu_scan_geo">
+        android:title="@string/menu_scan_geo"
+        cgeo:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_about"
         android:icon="@drawable/ic_menu_info_details"
-        android:title="@string/menu_about">
+        android:title="@string/menu_about"
+        cgeo:showAsAction="ifRoom">
     </item>
+
 </menu>
 \ No newline at end of file