From f1aadadf13d7ba71373ea507b0c2d1a1c81bcfca Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Mon, 20 Oct 2014 18:15:51 +0200
Subject: fix #4426: Disable optional action bar actions by default

---
 main/res/menu/cache_list_options.xml    |  9 ++++++---
 main/res/menu/cache_options.xml         |  3 +++
 main/res/menu/logging_ui.xml            | 12 +++++++-----
 main/res/menu/main_activity_options.xml |  2 ++
 main/res/menu/map_activity.xml          |  5 ++++-
 main/res/menu/trackable_activity.xml    | 12 +++++++-----
 6 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/main/res/menu/cache_list_options.xml b/main/res/menu/cache_list_options.xml
index 7c933c0..8c2b066 100644
--- a/main/res/menu/cache_list_options.xml
+++ b/main/res/menu/cache_list_options.xml
@@ -108,15 +108,18 @@
     </item>
     <item
         android:id="@+id/menu_delete_events"
-        android:title="@string/caches_delete_events">
+        android:title="@string/caches_delete_events"
+        android:visible="false">
     </item>
     <item
         android:id="@+id/menu_clear_offline_logs"
-        android:title="@string/caches_clear_offlinelogs">
+        android:title="@string/caches_clear_offlinelogs"
+        android:visible="false">
     </item>
     <item
         android:id="@+id/menu_remove_from_history"
-        android:title="@string/cache_clear_history">
+        android:title="@string/cache_clear_history"
+        android:visible="false">
     </item>
 
 </menu>
\ No newline at end of file
diff --git a/main/res/menu/cache_options.xml b/main/res/menu/cache_options.xml
index 20ee9cd..8fdb2aa 100644
--- a/main/res/menu/cache_options.xml
+++ b/main/res/menu/cache_options.xml
@@ -20,18 +20,21 @@
         android:id="@+id/menu_log_visit_offline"
         android:icon="@drawable/ic_menu_edit"
         android:title="@string/cache_menu_visit_offline"
+        android:visible="false"
         app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_log_visit"
         android:icon="@drawable/ic_menu_edit"
         android:title="@string/cache_menu_visit"
+        android:visible="false"
         app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_calendar"
         android:icon="@drawable/ic_menu_my_calendar"
         android:title="@string/cache_menu_event"
+        android:visible="false"
         app:showAsAction="ifRoom">
     </item>
     <item
diff --git a/main/res/menu/logging_ui.xml b/main/res/menu/logging_ui.xml
index 921b350..7c41c6f 100644
--- a/main/res/menu/logging_ui.xml
+++ b/main/res/menu/logging_ui.xml
@@ -1,18 +1,20 @@
 <?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">
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <item
         android:id="@+id/menu_log_visit_offline"
         android:icon="@drawable/ic_menu_edit"
-        app:showAsAction="ifRoom|withText"
-        android:title="@string/cache_menu_visit_offline">
+        android:title="@string/cache_menu_visit_offline"
+        android:visible="false"
+        app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/menu_log_visit"
         android:icon="@drawable/ic_menu_edit"
-        app:showAsAction="ifRoom|withText"
-        android:title="@string/cache_menu_visit">
+        android:title="@string/cache_menu_visit"
+        android:visible="false"
+        app:showAsAction="ifRoom|withText">
     </item>
 
 </menu>
\ No newline at end of file
diff --git a/main/res/menu/main_activity_options.xml b/main/res/menu/main_activity_options.xml
index b17080b..72fe022 100644
--- a/main/res/menu/main_activity_options.xml
+++ b/main/res/menu/main_activity_options.xml
@@ -20,6 +20,7 @@
         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
@@ -38,6 +39,7 @@
         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
diff --git a/main/res/menu/map_activity.xml b/main/res/menu/map_activity.xml
index 9559560..04ccd98 100644
--- a/main/res/menu/map_activity.xml
+++ b/main/res/menu/map_activity.xml
@@ -26,6 +26,7 @@
         android:icon="@drawable/ic_menu_refresh"
         android:showAsAction="ifRoom|withText"
         android:title="@string/map_live_disable"
+        android:visible="false"
         app:showAsAction="ifRoom|withText">
     </item>
     <item
@@ -70,12 +71,14 @@
         android:icon="@drawable/ic_menu_preferences"
         android:showAsAction="ifRoom|withText"
         android:title="@string/map_theme_select"
+        android:visible="false"
         app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/submenu_strategy"
         android:icon="@drawable/ic_menu_preferences"
-        android:title="@string/map_strategy">
+        android:title="@string/map_strategy"
+        android:visible="false">
         <menu>
             <group
                 android:id="@+id/menu_group_strategy"
diff --git a/main/res/menu/trackable_activity.xml b/main/res/menu/trackable_activity.xml
index 5bcd706..4b952d5 100644
--- a/main/res/menu/trackable_activity.xml
+++ b/main/res/menu/trackable_activity.xml
@@ -1,18 +1,20 @@
 <?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">
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <item
         android:id="@+id/menu_log_touch"
         android:icon="@drawable/ic_menu_edit"
-        app:showAsAction="ifRoom|withText"
-        android:title="@string/trackable_log_touch">
+        android:title="@string/trackable_log_touch"
+        android:visible="false"
+        app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/menu_browser_trackable"
         android:icon="@drawable/ic_menu_info_details"
-        app:showAsAction="ifRoom|withText"
-        android:title="@string/trackable_browser_open">
+        android:title="@string/trackable_browser_open"
+        android:visible="false"
+        app:showAsAction="ifRoom|withText">
     </item>
 
 </menu>
\ No newline at end of file
-- 
cgit v1.1