diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-12-26 10:25:52 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-12-26 10:25:52 +0100 |
| commit | 7073afd8536ce82aaa8250f94903420d57b8b939 (patch) | |
| tree | fc5c3b7e3389f3430cef3e5d45b2d9300af8d57c /main/res | |
| parent | c3a3fe7b9b6a65b7a91684ae325355537865c4cf (diff) | |
| download | cgeo-7073afd8536ce82aaa8250f94903420d57b8b939.zip cgeo-7073afd8536ce82aaa8250f94903420d57b8b939.tar.gz cgeo-7073afd8536ce82aaa8250f94903420d57b8b939.tar.bz2 | |
fix 4556: scan menu shall always be visible
Diffstat (limited to 'main/res')
| -rw-r--r-- | main/res/menu/main_activity_options.xml | 101 |
1 files changed, 50 insertions, 51 deletions
diff --git a/main/res/menu/main_activity_options.xml b/main/res/menu/main_activity_options.xml index 72fe022..d556cdb 100644 --- a/main/res/menu/main_activity_options.xml +++ b/main/res/menu/main_activity_options.xml @@ -1,52 +1,51 @@ -<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto" >
-
- <!-- TODO: use ic_action_search -->
- <item
- android:id="@+id/menu_gosearch"
- style="@style/action_bar_action"
- android:icon="@drawable/abc_ic_search"
- android:title="@string/search_bar_hint"
- app:actionViewClass="android.support.v7.widget.SearchView"
- app:showAsAction="collapseActionView|always"/>
- <item
- android:id="@+id/menu_history"
- android:icon="@drawable/ic_menu_recent_history"
- android:title="@string/menu_history"
- app:showAsAction="ifRoom">
- </item>
- <item
- android:id="@+id/menu_pocket_queries"
- android:icon="@drawable/ic_menu_account_list"
- android:title="@string/menu_pocket_queries"
- android:visible="false"
- app:showAsAction="ifRoom">
- </item>
- <item
- android:id="@+id/menu_settings"
- android:icon="@drawable/ic_menu_preferences"
- android:title="@string/menu_settings"
- app:showAsAction="ifRoom">
- </item>
- <item
- android:id="@+id/menu_helpers"
- android:icon="@drawable/ic_menu_shopping"
- android:title="@string/menu_helpers"
- app:showAsAction="ifRoom">
- </item>
- <item
- android:id="@+id/menu_scan"
- android:icon="@drawable/ic_menu_barcode"
- android:title="@string/menu_scan_geo"
- android:visible="false"
- app:showAsAction="ifRoom">
- </item>
- <item
- android:id="@+id/menu_about"
- android:icon="@drawable/ic_menu_info_details"
- android:title="@string/menu_about"
- app:showAsAction="ifRoom">
- </item>
-
+<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" > + + <!-- TODO: use ic_action_search --> + <item + android:id="@+id/menu_gosearch" + style="@style/action_bar_action" + android:icon="@drawable/abc_ic_search" + android:title="@string/search_bar_hint" + app:actionViewClass="android.support.v7.widget.SearchView" + app:showAsAction="collapseActionView|always"/> + <item + android:id="@+id/menu_history" + android:icon="@drawable/ic_menu_recent_history" + android:title="@string/menu_history" + app:showAsAction="ifRoom"> + </item> + <item + android:id="@+id/menu_pocket_queries" + android:icon="@drawable/ic_menu_account_list" + android:title="@string/menu_pocket_queries" + android:visible="false" + app:showAsAction="ifRoom"> + </item> + <item + android:id="@+id/menu_settings" + android:icon="@drawable/ic_menu_preferences" + android:title="@string/menu_settings" + app:showAsAction="ifRoom"> + </item> + <item + android:id="@+id/menu_helpers" + android:icon="@drawable/ic_menu_shopping" + android:title="@string/menu_helpers" + app:showAsAction="ifRoom"> + </item> + <item + android:id="@+id/menu_scan" + android:icon="@drawable/ic_menu_barcode" + android:title="@string/menu_scan_geo" + app:showAsAction="ifRoom"> + </item> + <item + android:id="@+id/menu_about" + android:icon="@drawable/ic_menu_info_details" + android:title="@string/menu_about" + app:showAsAction="ifRoom"> + </item> + </menu>
\ No newline at end of file |