advanced search should for now be an item only in the search activity's menu

diff --git a/Open-ILS/src/Android/core/res/menu/menu_main.xml b/Open-ILS/src/Android/core/res/menu/menu_main.xml
index a7758e0..fe5d675 100644 (file)
--- a/Open-ILS/src/Android/core/res/menu/menu_main.xml
+++ b/Open-ILS/src/Android/core/res/menu/menu_main.xml
@@ -6,7 +6,4 @@
           android:icon="@drawable/abc_ic_search"
           android:title="@string/title_search"
           yourapp:showAsAction="ifRoom"/>
-    <item android:id="@+id/action_advanced_search"
-          android:icon="@drawable/abc_ic_search"
-          android:title="@string/advanced_search"/>
 </menu>
\ No newline at end of file

diff --git a/Open-ILS/src/Android/core/res/menu/menu_search.xml b/Open-ILS/src/Android/core/res/menu/menu_search.xml
new file mode 100644 (file)
index 0000000..a7758e0
--- /dev/null
+++ b/Open-ILS/src/Android/core/res/menu/menu_search.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:yourapp="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/action_search"
+          android:icon="@drawable/abc_ic_search"
+          android:title="@string/title_search"
+          yourapp:showAsAction="ifRoom"/>
+    <item android:id="@+id/action_advanced_search"
+          android:icon="@drawable/abc_ic_search"
+          android:title="@string/advanced_search"/>
+</menu>
\ No newline at end of file

diff --git a/Open-ILS/src/Android/core/res/menu/search_menu.xml b/Open-ILS/src/Android/core/res/menu/search_menu.xml
deleted file mode 100644 (file)
index c5fd140..0000000
--- a/Open-ILS/src/Android/core/res/menu/search_menu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_advanced_settings"
-        android:title="advanced"
-        android:icon="@drawable/ic_action_settings"
-        android:orderInCategory="1"
-        android:showAsAction="always" />
-
-
-</menu>

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java
index add1d85..fc1fe10 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java
@@ -593,7 +593,7 @@ public class SearchCatalogListView extends ActionBarActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.menu_main, menu);
+        inflater.inflate(R.menu.menu_search, menu);
         return super.onCreateOptionsMenu(menu);
     }