fix #1781: Remove help function

20 files changed, 24 insertions, 106 deletions

diff --git a/main/res/layout/actionbar_button_manual.xml b/main/res/layout/actionbar_button_manual.xml
deleted file mode 100644
index 86965f1..0000000
--- a/main/res/layout/actionbar_button_manual.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <View style="@style/action_bar_separator" />
-
-    <ImageView
-        android:id="@+id/action_bar_manual"
-        style="@style/action_bar_action"
-        android:onClick="goManual"
-        android:src="@drawable/actionbar_manual" />
-
-</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_with_manual.xml b/main/res/layout/actionbar_with_manual.xml
deleted file mode 100644
index d56c14e..0000000
--- a/main/res/layout/actionbar_with_manual.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/action_bar" >
-
-    <include layout="@layout/actionbar_title"/>
-
-    <include layout="@layout/actionbar_button_manual"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/caches.xml b/main/res/layout/caches.xml
index dea9357..5c3abbc 100644
--- a/main/res/layout/caches.xml
+++ b/main/res/layout/caches.xml
@@ -7,12 +7,10 @@
     <LinearLayout style="@style/action_bar" >
 
         <include layout="@layout/actionbar_title" />
-        
+
         <include layout="@layout/actionbar_progress" />
-        
-        <include layout="@layout/actionbar_button_map" />
 
-        <include layout="@layout/actionbar_button_manual" />
+        <include layout="@layout/actionbar_button_map" />
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/cacheview.xml b/main/res/layout/cacheview.xml
index ec30672..44765dc 100644
--- a/main/res/layout/cacheview.xml
+++ b/main/res/layout/cacheview.xml
@@ -11,8 +11,6 @@
         <include layout="@layout/actionbar_title" />

 

         <include layout="@layout/actionbar_button_compass" />

-

-        <include layout="@layout/actionbar_button_manual" />

     </LinearLayout>

 

     <android.support.v4.view.ViewPager

diff --git a/main/res/layout/coords.xml b/main/res/layout/coords.xml
index 229cffe..6da453e 100644
--- a/main/res/layout/coords.xml
+++ b/main/res/layout/coords.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual"/>
+    <include layout="@layout/actionbar" />
 
     <ScrollView
         android:id="@+id/scroller"
diff --git a/main/res/layout/edit_waypoint_activity.xml b/main/res/layout/edit_waypoint_activity.xml
index c2751d1..657e9f4 100644
--- a/main/res/layout/edit_waypoint_activity.xml
+++ b/main/res/layout/edit_waypoint_activity.xml
@@ -5,7 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual"/>
+    <include layout="@layout/actionbar" />
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index c948629..ab38fb6 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -5,7 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual" />
+    <include layout="@layout/actionbar" />
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/main.xml b/main/res/layout/main.xml
index e4aa9cc..e90cd37 100644
--- a/main/res/layout/main.xml
+++ b/main/res/layout/main.xml
@@ -13,9 +13,7 @@
 
         <TextView style="@style/action_bar_title" />
 
-        <include layout="@layout/actionbar_button_search"/>
-
-        <include layout="@layout/actionbar_button_manual"/>
+        <include layout="@layout/actionbar_button_search" />
     </LinearLayout>
 
     <fragment
@@ -168,41 +166,6 @@
     </LinearLayout>
     <!-- ** -->
 
-    <RelativeLayout
-        android:id="@+id/helper"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="64dip"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:background="@drawable/helper_bcg"
-        android:visibility="gone" >
-
-        <ImageView
-            android:layout_width="32dip"
-            android:layout_height="32dip"
-            android:layout_alignParentLeft="true"
-            android:layout_gravity="center"
-            android:layout_margin="4dip"
-            android:gravity="center"
-            android:scaleType="center"
-            android:src="@drawable/actionbar_manual" />
-
-        <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_gravity="center"
-            android:layout_marginLeft="34dip"
-            android:gravity="center"
-            android:padding="4dip"
-            android:text="@string/helper"
-            android:textColor="@color/text_icon"
-            android:textSize="14dip" />
-    </RelativeLayout>
-    <!-- ** -->
-
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/main/res/layout/map_google.xml b/main/res/layout/map_google.xml
index 7b116c9..3e460ef 100644
--- a/main/res/layout/map_google.xml
+++ b/main/res/layout/map_google.xml
@@ -6,13 +6,11 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <include layout="@layout/actionbar_title"/>
+        <include layout="@layout/actionbar_title" />
 
         <include layout="@layout/actionbar_progress" />
 
-        <include layout="@layout/actionbar_button_myposition"/>
-        
-        <include layout="@layout/actionbar_button_manual"/>
+        <include layout="@layout/actionbar_button_myposition" />
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/map_mapsforge.xml b/main/res/layout/map_mapsforge.xml
index 27d6e0d..1833da3 100644
--- a/main/res/layout/map_mapsforge.xml
+++ b/main/res/layout/map_mapsforge.xml
@@ -6,13 +6,11 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <include layout="@layout/actionbar_title"/>
+        <include layout="@layout/actionbar_title" />
 
         <include layout="@layout/actionbar_progress" />
 
-        <include layout="@layout/actionbar_button_myposition"/>
-
-        <include layout="@layout/actionbar_button_manual"/>
+        <include layout="@layout/actionbar_button_myposition" />
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/map_mapsforge_old.xml b/main/res/layout/map_mapsforge_old.xml
index f2cb175..6ca98e1 100644
--- a/main/res/layout/map_mapsforge_old.xml
+++ b/main/res/layout/map_mapsforge_old.xml
@@ -6,13 +6,11 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <include layout="@layout/actionbar_title"/>
+        <include layout="@layout/actionbar_title" />
 
         <include layout="@layout/actionbar_progress" />
 
-        <include layout="@layout/actionbar_button_myposition"/>
-        
-        <include layout="@layout/actionbar_button_manual"/>
+        <include layout="@layout/actionbar_button_myposition" />
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml
index 4486884..ae51735 100644
--- a/main/res/layout/navigate.xml
+++ b/main/res/layout/navigate.xml
@@ -5,8 +5,6 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual" />
-
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" >
diff --git a/main/res/layout/point.xml b/main/res/layout/point.xml
index 5297d6d..baa568c 100644
--- a/main/res/layout/point.xml
+++ b/main/res/layout/point.xml
@@ -5,7 +5,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual" />
+    <include layout="@layout/actionbar" />
 
     <ListView
         android:id="@+id/historyList"
diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml
index 97c1367..15e4248 100644
--- a/main/res/layout/popup.xml
+++ b/main/res/layout/popup.xml
@@ -10,10 +10,8 @@
         <TextView
             android:id="@+id/actionbar_title"
             style="@style/action_bar_title" />
-		
-        <include layout="@layout/actionbar_button_compass"/>
-        
-        <include layout="@layout/actionbar_button_manual"/>
+
+        <include layout="@layout/actionbar_button_compass" />
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/search.xml b/main/res/layout/search.xml
index 449ad5d..a0a699d 100644
--- a/main/res/layout/search.xml
+++ b/main/res/layout/search.xml
@@ -6,7 +6,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_with_manual" />
+    <include layout="@layout/actionbar" />
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/touch.xml b/main/res/layout/touch.xml
index 17553d1..61778ce 100644
--- a/main/res/layout/touch.xml
+++ b/main/res/layout/touch.xml
@@ -7,11 +7,9 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <include layout="@layout/actionbar_title"/>
+        <include layout="@layout/actionbar_title" />
 
         <include layout="@layout/actionbar_progress" />
-
-        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/trackable_activity.xml b/main/res/layout/trackable_activity.xml
index f0176fc..bcfb42d 100644
--- a/main/res/layout/trackable_activity.xml
+++ b/main/res/layout/trackable_activity.xml
@@ -6,7 +6,7 @@
     android:background="?background_color"

     android:orientation="vertical" >

 

-    <include layout="@layout/actionbar_with_manual" />

+    <include layout="@layout/actionbar" />

 

     <android.support.v4.view.ViewPager

         android:id="@+id/viewpager"

diff --git a/main/res/layout/visit.xml b/main/res/layout/visit.xml
index ed32d25..7ffd630 100644
--- a/main/res/layout/visit.xml
+++ b/main/res/layout/visit.xml
@@ -7,11 +7,9 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <include layout="@layout/actionbar_title"/>
+        <include layout="@layout/actionbar_title" />
 
         <include layout="@layout/actionbar_progress" />
-
-        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/visit_image.xml b/main/res/layout/visit_image.xml
index d39d5ae..fd8eaea 100644
--- a/main/res/layout/visit_image.xml
+++ b/main/res/layout/visit_image.xml
@@ -7,11 +7,9 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <include layout="@layout/actionbar_title"/>
+        <include layout="@layout/actionbar_title" />
 
         <include layout="@layout/actionbar_progress" />
-
-        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
@@ -89,9 +87,9 @@
                 android:id="@+id/logImageScale"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:prompt="@string/log_image_scale"
-                android:entries="@array/log_image_scales"/>
-            
+                android:entries="@array/log_image_scales"
+                android:prompt="@string/log_image_scale" />
+
             <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
diff --git a/main/res/layout/waypoint_popup.xml b/main/res/layout/waypoint_popup.xml
index c2b2af8..b3806aa 100644
--- a/main/res/layout/waypoint_popup.xml
+++ b/main/res/layout/waypoint_popup.xml
@@ -11,9 +11,7 @@
             android:id="@+id/actionbar_title"
             style="@style/action_bar_title" />
 
-        <include layout="@layout/actionbar_button_compass"/>
-        
-        <include layout="@layout/actionbar_button_manual"/>
+        <include layout="@layout/actionbar_button_compass" />
     </LinearLayout>
 
     <ScrollView