From 8f8cc702d2d95b239c0a7bb465f6569db260749c Mon Sep 17 00:00:00 2001
From: "Igor B. Poretsky" <poretsky@mlbox.ru>
Date: Wed, 20 Apr 2016 13:16:24 +0300
Subject: [PATCH] Fixed and enhanced map accessibility actions.

Context menu popped up by long click on the map view in accessibility
mode when map is bound to location now relates to the point map is
bound to.
---
 OsmAnd/res/values-af/strings.xml                |  1 -
 OsmAnd/res/values-ar/strings.xml                |  1 -
 OsmAnd/res/values-be-rBY/strings.xml            |  1 -
 OsmAnd/res/values-be/strings.xml                |  1 -
 OsmAnd/res/values-bg/strings.xml                |  1 -
 OsmAnd/res/values-ca/strings.xml                |  1 -
 OsmAnd/res/values-cs/strings.xml                |  1 -
 OsmAnd/res/values-da/strings.xml                |  1 -
 OsmAnd/res/values-de/strings.xml                |  1 -
 OsmAnd/res/values-el/strings.xml                |  1 -
 OsmAnd/res/values-es-rAR/strings.xml            |  1 -
 OsmAnd/res/values-es-rUS/strings.xml            |  1 -
 OsmAnd/res/values-es/strings.xml                |  1 -
 OsmAnd/res/values-eu/strings.xml                |  1 -
 OsmAnd/res/values-fa/strings.xml                |  1 -
 OsmAnd/res/values-fr/strings.xml                |  1 -
 OsmAnd/res/values-gl/strings.xml                |  1 -
 OsmAnd/res/values-he/strings.xml                |  1 -
 OsmAnd/res/values-hu/strings.xml                |  1 -
 OsmAnd/res/values-hy/strings.xml                |  1 -
 OsmAnd/res/values-it/strings.xml                |  1 -
 OsmAnd/res/values-ja/strings.xml                |  1 -
 OsmAnd/res/values-ka/strings.xml                |  1 -
 OsmAnd/res/values-ko/strings.xml                |  1 -
 OsmAnd/res/values-lt/strings.xml                |  1 -
 OsmAnd/res/values-lv/strings.xml                |  1 -
 OsmAnd/res/values-nl/strings.xml                |  1 -
 OsmAnd/res/values-pl/strings.xml                |  1 -
 OsmAnd/res/values-pt-rBR/strings.xml            |  1 -
 OsmAnd/res/values-pt/strings.xml                |  1 -
 OsmAnd/res/values-ru/strings.xml                |  2 +-
 OsmAnd/res/values-sc/strings.xml                |  1 -
 OsmAnd/res/values-sk/strings.xml                |  1 -
 OsmAnd/res/values-sl/strings.xml                |  1 -
 OsmAnd/res/values-sv/strings.xml                |  1 -
 OsmAnd/res/values-tr/strings.xml                |  1 -
 OsmAnd/res/values-uk/strings.xml                |  1 -
 OsmAnd/res/values-zh-rTW/strings.xml            |  1 -
 OsmAnd/res/values/strings.xml                   |  2 +-
 .../osmand/access/MapAccessibilityActions.java  | 17 +++++++++--------
 .../net/osmand/plus/OsmAndLocationProvider.java |  6 ++----
 41 files changed, 13 insertions(+), 51 deletions(-)

diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml
index 9266ce1917..e33309ac96 100644
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@@ -1106,7 +1106,6 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass
     <string name="wait_current_task_finished">Wag asseblief terwyl huidige taak afhandel</string>
     <string name="use_kalman_filter_compass_descr">Gebruik Kalman filter om kompas afwykings te vermy</string>
     <string name="use_kalman_filter_compass">Gebruik Kalman filter</string>
-    <string name="access_mark_final_location_first">Toeganklikheids wyse: kies asseblief eers die bestemming</string> 
     <string name="use_magnetic_sensor_descr">Gebruik die magnetiese sensor om die kompas waarde te bepaal in plaas van die oriëntasie sensor</string>
     <string name="use_magnetic_sensor">Gebruik magnetiese sensor</string>
     <string name="local_indexes_cat_srtm">Kontoer lyne inligting</string>
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index d20f227cee..a1700f0ff0 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -477,7 +477,6 @@
 	
     <string name="use_kalman_filter_compass_descr">يقلل الشوشرة في قراءة البوصلة ولكن يضيف قصور ذاتي</string>
     <string name="use_kalman_filter_compass">استخدم مُرشّح كالمان</string>
-    <string name="access_mark_final_location_first">نمط الإتاحة: اختر وجهتك أولًا رجاءً</string> 
     <string name="av_photo_play_sound">شغّل صوتًا عند التقاط صورة</string>
 	<string name="use_magnetic_sensor">استخدم الاستشعار المغناطيسي</string>
     <string name="av_widget_action_descr">حدد عمل الودجة الافتراضي</string>
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index 5b7f2fc725..ab509159f8 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -529,7 +529,6 @@
     <string name="wait_current_task_finished">Kalі laska, pačakajcie pakuĺ biahučaja zadača nie budzie zavieršanaja</string>
     <string name="use_kalman_filter_compass_descr">Vykarystoŭvać fіĺtar Kalmana kab praduchіlіć aberacyju kompasu</string>
     <string name="use_kalman_filter_compass">Vykarystoŭvać fіĺtar Kalmana</string>
-    <string name="access_mark_final_location_first">Režym dastupnaścі: Kalі laska, spačatku abiarycie punkt pryznačeńnia</string> 
     <string name="use_magnetic_sensor_descr">Vykarystoŭvać dlia pracy kompasa mahnіtny datčyk zamiest datčyka aryjentacyі</string>
     <string name="use_magnetic_sensor">Vykarystoŭvać mahnіtomietr</string>
     <string name="other_location">Іnšaje</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 8086921fe5..cf68ba89fa 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -90,7 +90,6 @@
     <string name="wait_current_task_finished">Калі ласка, пачакайце пакуль бягучая задача не будзе завершаная</string>
     <string name="use_kalman_filter_compass_descr">Зьніжае шум паказаньняў компасу, але дадае інэрцыю</string>
     <string name="use_kalman_filter_compass">Выкарыстоўваць фільтар Калмана</string>
-    <string name="access_mark_final_location_first">Рэжым даступнасьці: Калі ласка, спачатку абярыце пункт прызначэньня</string> 
     <string name="use_magnetic_sensor_descr">Выкарыстоўваць для працы компаса магнітны датчык замест датчыка арыентацыі</string>
     <string name="use_magnetic_sensor">Выкарыстоўваць магнітомэтр</string>
     <string name="other_location">Іншае</string>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index f6fc08bad0..8c97ec5c82 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -53,7 +53,6 @@
     <string name="distance_measurement_load_gpx">Отвори съществуващ GPX</string>
     <string name="wait_current_task_finished">Моля, почакайте докато свърши текущата задача</string>
     <string name="use_kalman_filter_compass_descr">Намалява трептенето на компаса, но го прави по-бавен</string>
-    <string name="access_mark_final_location_first">Режим на достъпност: Моля, изберете първо крайната цел</string>
     <string name="use_magnetic_sensor_descr">Използвай магнитния сензор за определяне на компасната посока вместо сензора за ориентиране</string>
     <string name="use_magnetic_sensor">Използвай магнитния сензор</string>
     <string name="other_location">Друго</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 95410eaec8..38e3c0a23c 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -915,7 +915,6 @@
     <string name="wait_current_task_finished">Espereu fins que finalitzi la tasca actual</string>
     <string name="use_kalman_filter_compass_descr">Allisat de la brúixola per estabilitzar lectures afegint inèrcia</string>
     <string name="use_kalman_filter_compass">Usa el filtre Kalman</string>
-    <string name="access_mark_final_location_first">Mode d\'accessibilitat: seleccioneu primer la destinació</string>
     <string name="use_magnetic_sensor_descr">Podeu usar el sensor magnètic per determinar el valor la brúixola en comptes del sensor d\'orientació</string>
     <string name="use_magnetic_sensor">Usa el sensor magnètic</string>
     <string name="other_location">Una altra</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 32423d0820..a01fa8fd45 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -955,7 +955,6 @@
     <string name="use_kalman_filter_compass_descr">Sníží šum v hodnotách z kompasu, ale zpomalí změny směru</string>
     <string name="use_kalman_filter_compass">Použít Kalmanův filtr</string>
     <string name="use_magnetic_sensor">Používat magnetický senzor</string>
-    <string name="access_mark_final_location_first">Usnadnění: vyberte prosím nejdříve cíl</string>
     <string name="wait_current_task_finished">Čekejte prosím na dokončení úlohy</string>
     <string name="use_magnetic_sensor_descr">Použít magnetický senzor k určení směru místo senzoru natočení</string>
     <string name="cancel_route">Zrušit trasu</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 3fea15a3ef..a99f3e5a19 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1148,7 +1148,6 @@
     <string name="use_magnetic_sensor_descr">Brug magnetisksensor i stedet for retningssensor til at bestemme kompasværdi</string>
     <string name="use_kalman_filter_compass_descr">Reducerer støj i kompasaflæsninger, men tilføjer inerti</string>
     <string name="use_kalman_filter_compass">Kalman filter</string>
-    <string name="access_mark_final_location_first">Tilgængelighedstilstand: Vælg destination først</string>
     <string name="wait_current_task_finished">Vent - mens aktuel opgave bliver færdig</string>
     <string name="plugin_distance_point_hdop">nøjagtighed</string>
     <string name="plugin_distance_point_speed">hastighed</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 3244839c07..1b03b4ce79 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1140,7 +1140,6 @@ Für Hilfe mit der OsmAnd-App kontaktieren Sie bitte unser Support-Team unter su
 	<string name="cancel_route">Route verwerfen</string>
 	<string name="use_kalman_filter_compass_descr">Kompass-Rauschreduzierung (erhöht die Kompassträgheit etwas)</string>
 	<string name="use_kalman_filter_compass">Kalman-Filter verwenden</string>
-	<string name="access_mark_final_location_first">Eingabehilfen-Modus: Bitte zuerst Ziel auswählen</string>
 	<string name="use_magnetic_sensor_descr">Magnetsensor statt Lagesensor zur Kompassermittlung verwenden</string>
 	<string name="use_magnetic_sensor">Magnetsensor verwenden</string>
 	<string name="local_indexes_cat_srtm">Höhenlinien</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 8105f3c261..c07dd5af79 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1057,7 +1057,6 @@
     <string name="use_magnetic_sensor_descr">Χρήση του μαγνητικού αισθητήρα για τον προσδιορισμό της ένδειξης της πυξίδας, αντί του αισθητήρα προσανατολισμού</string>
     <string name="use_kalman_filter_compass_descr">Μειώνει τον θόρυβο στην ανάγνωση της πυξίδας αλλά προσθέτει αδράνεια</string>
     <string name="use_kalman_filter_compass">Χρήση φίλτρου Kalman</string>
-    <string name="access_mark_final_location_first">Λειτουργία προσβασιμότητας: παρακαλώ επιλέξτε πρώτα προορισμό</string> 
     <string name="wait_current_task_finished">Παρακαλώ περιμένετε μέχρι να τελειώσει η τρέχουσα διεργασία</string>
     <string name="local_indexes_cat_srtm">Δεδομένα ισοϋψών γραμμών</string>
     <string name="shared_string_downloading">Λήψη</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index e223632874..70b0d32001 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -681,7 +681,6 @@
     <string name="wait_current_task_finished">Espere hasta que termine la tarea actual</string>
     <string name="use_kalman_filter_compass_descr">Reduce el ruido en las lecturas de la brújula pero añade inercia</string>
     <string name="use_kalman_filter_compass">Usar filtro Kalman</string>
-    <string name="access_mark_final_location_first">Modo Accesibilidad: Elige el destino primero</string>
     <string name="use_magnetic_sensor_descr">Usa el sensor magnético para determinar el valor de la brújula en vez del sensor de orientación</string>
     <string name="use_magnetic_sensor">Usar sensor magnético</string>
     <string name="other_location">Otra</string>
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index 53572a16e7..908a2d8498 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -681,7 +681,6 @@
     <string name="wait_current_task_finished">Espere hasta que termine la tarea actual</string>
     <string name="use_kalman_filter_compass_descr">Reduce el ruido en las lecturas de la brújula pero añade inercia</string>
     <string name="use_kalman_filter_compass">Usar filtro Kalman</string>
-    <string name="access_mark_final_location_first">Modo Accesibilidad: Elige el destino primero</string>
     <string name="use_magnetic_sensor_descr">Usa el sensor magnético para determinar el valor de la brújula en vez del sensor de orientación</string>
     <string name="use_magnetic_sensor">Usar sensor magnético</string>
     <string name="other_location">Otra</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 71d582dfe2..acae6d8ddf 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1014,7 +1014,6 @@
     <string name="shared_string_more_actions">Más acciones</string>
     <string name="use_kalman_filter_compass_descr">Reduce el ruido en las lecturas de la brújula pero añade inercia</string>
     <string name="use_kalman_filter_compass">Utilizar filtro Kalman</string>
-    <string name="access_mark_final_location_first">Modo Accesibilidad: seleccione el destino primero</string>
     <string name="use_magnetic_sensor_descr">Utiliza el sensor magnético para determinar el valor de la brújula en vez del sensor de orientación</string>
     <string name="use_magnetic_sensor">Utilizar sensor magnético</string>
     <string name="other_location">Otra</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 1c3af5c4fa..de483217c6 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -81,7 +81,6 @@
   <string name="wait_current_task_finished">Mesedez itxaron uneko zeregina bukatu harte</string>
   <string name="use_kalman_filter_compass_descr">Kalman filtroa erabili konpasaren aberrazioak ekiditeko</string>
   <string name="use_kalman_filter_compass">Kalman filtroa erabili</string>
-  <string name="access_mark_final_location_first">Erabil-erraztasun modua: mesedez aukeratu helmuga lehendabizi</string>
   <string name="use_magnetic_sensor_descr">Konpasaren balioa erabakitzeko erabili sentsore magnetikoa orientazio sentsorearen ordez</string>
   <string name="use_magnetic_sensor">Sentsore magnetikoa erabili</string>
   <string name="other_location">Bestelakoa</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index fa4a0ab956..6d02c71e96 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -179,7 +179,6 @@
 	<string name="local_osm_changes_backup">پشتیبان‌گیری به عنوان تغییرات OsmAnd</string>
     <string name="delete_point">حذف نقطه</string>
     <string name="use_kalman_filter_compass">استفاده از فیلتر کالمن</string>
-    <string name="access_mark_final_location_first">حالت دسترسی: لطفاً ابتدا مقصد را انتخاب نمایید</string> 
     <string name="cancel_route">لغو مسیر</string>
     <string name="max_speed_none">هیچ کدام</string>
     <string name="dropbox_plugin_name">افزونه دراپ باکس</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 5ba7a8c2ff..801e6518a2 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1080,7 +1080,6 @@
     <string name="local_indexes_cat_srtm">Courbes de niveau</string>
     <string name="use_kalman_filter_compass_descr">Réduit le bruit sur les mesures de la boussole, mais ajoute de l\'inertie</string>
     <string name="use_kalman_filter_compass">Utiliser un filtre de Kalman</string>
-    <string name="access_mark_final_location_first">Mode d\'accessibilité : veuillez d\'abord définir une destination</string>
     <string name="distance_measurement_start_editing">Démarrer la mesure sur la carte</string>
     <string name="distance_measurement_finish_editing">Terminer la mesure</string>
 
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index 9b760f089c..ec2d74cd15 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -455,7 +455,6 @@
     <string name="wait_current_task_finished">Agarde até que remate a tarefa actual</string>
     <string name="use_kalman_filter_compass_descr">Reduce o ruído nas lecturas do compás mais engade inercia</string>
     <string name="use_kalman_filter_compass">Empregar o filtro Kalman</string>
-    <string name="access_mark_final_location_first">Modo de accesibilidade: seleccione primeiro o destino</string> 
     <string name="use_magnetic_sensor_descr">Empregar o sensor magnético para determinar o valor do compás no canto do sensor de orientación</string>
     <string name="use_magnetic_sensor">Empregar o sensor magnético</string>
     <string name="other_location">Outra</string>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index e0b0c7d906..d133ccf002 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -1093,7 +1093,6 @@
     <string name="use_magnetic_sensor_descr">שימוש בחיישן מגנטי כדי לזהות את ערך המצפן במקום חיישן הכיוון</string>
     <string name="use_magnetic_sensor">שימוש בחיישן מגנטי (מצפן)</string>
     <string name="use_kalman_filter_compass">שימוש במסנן קלמן</string>
-    <string name="access_mark_final_location_first">מצב נגישות : נא לבחור ביעד תחילה</string> 
     <string name="use_kalman_filter_compass_descr">ניתן להשתמש במסנן קלמן למניעת סטיות מצפן</string>
     <string name="local_indexes_cat_srtm">נתוני קווי מתאר</string>
     <string name="wait_current_task_finished">נא להמתין להשלמת המשימה הנוכחית</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 0e579a8068..dedf63f958 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -1073,7 +1073,6 @@
     <string name="use_magnetic_sensor">Mágnesszenzor (iránytű) használata</string>
     <string name="use_kalman_filter_compass_descr">Csökkenti a zajt az iránytű olvasásakor, de hozzáadja a tehetetlenséget</string>
     <string name="use_kalman_filter_compass">Kálmán-szűrő használata</string>
-    <string name="access_mark_final_location_first">Kisegítő mód: előbb válassz célpontot</string>
 
     <string name="local_indexes_cat_srtm">Szintvonalak</string>
     <string name="wait_current_task_finished">Kérlek várd meg, amíg a jelenlegi befejeződik</string>
diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml
index 0e19005494..95a8a890cd 100644
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@@ -29,7 +29,6 @@
     <string name="email">էլ-փոստ</string>
 <string name="use_kalman_filter_compass_descr">Օգտագործել Կալմանի ֆիլտրը կողմնացույցի սխելներից խուսափելու համար</string>
     <string name="use_kalman_filter_compass">Օգտագործել Կալմանի ֆիլտրը</string>
-    <string name="access_mark_final_location_first">Մատչելիության ռեժիմ: խնդրում ենք ընտրել ուղղություն</string> 
     <string name="use_magnetic_sensor_descr">Օգտագործեք մագնիսական սենսորը որոշելու կողմնացույցի ուղղությունը</string>
     <string name="use_magnetic_sensor">Օգտագործել մագնիսական սենսորը</string>
     <string name="other_location">Այլ</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index bf4b4c7efb..eeb0b4629b 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1072,7 +1072,6 @@
     <string name="local_indexes_cat_srtm">Linee isocline</string>
     <string name="use_kalman_filter_compass_descr">Riduce il rumore delle letture della bussola ma introduce dell\'inerzia</string>
     <string name="use_kalman_filter_compass">Uso del filtro di Kalman</string>
-    <string name="access_mark_final_location_first">Modalità di accesso facilitato: selezionare prima la destinazione</string>
     <string name="wait_current_task_finished">Prego attendere il termine dell\'operazione</string>
     <string name="plugin_distance_point_time">orario</string>
     <string name="plugin_distance_point_hdop">precisione</string>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 8a11ef9f1f..4ddeb60108 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -709,7 +709,6 @@ POIの更新は利用できません</string>
     <string name="wait_current_task_finished">現在のタスクが終了するまでお待ちください</string>
     <string name="use_kalman_filter_compass_descr">慣性の追加を代償にして、電子コンパスの誤差を低減します</string>
     <string name="use_kalman_filter_compass">カルマンフィルタを使用</string>
-    <string name="access_mark_final_location_first">アクセシビリティモード:最初に目的地を選択して下さい</string> 
     <string name="use_magnetic_sensor_descr">回転センサーの代わりに磁気センサーの値をコンパスの値として使用します</string>
     <string name="use_magnetic_sensor">磁気センサーを使用</string>
     <string name="other_location">その他</string>
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index 3d7251e065..33851801c9 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -1154,7 +1154,6 @@
     <string name="wait_current_task_finished">გთხოვთ მოითმინოთ სანამ დასრულდება მიმდინარე ამოცანა</string>
     <string name="use_kalman_filter_compass_descr">კომპასის ცდომილებების თავიდან ასაცილებლად გამოიყენეთ კალმანის ფილტრი</string>
     <string name="use_kalman_filter_compass">კალმანის ფილტრის გამოყენება</string>
-    <string name="access_mark_final_location_first">მაღალი წვდომადობის რეჟიმი: გთხოვთ ჯერ აირჩიოთ დანიშნულების წერტილი</string> 
     <string name="use_magnetic_sensor_descr">კომპასის მნიშვნელობის გამოსათვლელად ორიენტაციის სენსორის მაგიერ მაგნიტური სენსორის გამოყენება</string>
     <string name="use_magnetic_sensor">მაგნიტური სენსორის გამოყენება</string>
     <string name="other_location">სხვა</string>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 0224e504cc..1d688f204c 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -962,7 +962,6 @@
     <string name="wait_current_task_finished">현재 작업이 완료 될 때까지 기다리십시오</string>
     <string name="use_kalman_filter_compass_descr">나침반 흔들림을 방지하기 위해 칼만 필터를 사용</string>
     <string name="use_kalman_filter_compass">칼만 필터 사용</string>
-    <string name="access_mark_final_location_first">접근성 모드 : 먼저 도착지를 선택하세요</string> 
     <string name="use_magnetic_sensor_descr">방위센서(GPS) 대신 나침반 값을 결정하는 지자기센서를 사용</string>
     <string name="use_magnetic_sensor">지자기센서를 사용</string>
     <string name="other_location">기타</string>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index bd3b589ace..0b0f0f2411 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -1079,7 +1079,6 @@
     <string name="use_magnetic_sensor">Naudoti magnetinį sensorių (kompasą)</string>
     <string name="use_kalman_filter_compass_descr">Sumažina kompaso triukšmą, tačiau prideda inertiškumo</string>
     <string name="use_kalman_filter_compass">Naudoti Kalmano filtrą</string>
-    <string name="access_mark_final_location_first">Prieigos režimas: pirmiausia pasirinkite kelionės tikslą</string>
     <string name="local_indexes_cat_srtm">Kontūrinės linijos</string>
     <string name="wait_current_task_finished">Palaukite kol dabartinė užduotis bus baigta</string>
     <string name="shared_string_downloading">Parsiunčiama</string>
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index b4cbbc9519..36d3513632 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -1174,7 +1174,6 @@
     <string name="background_service_is_enabled_question">OsmAnd serviss turpinās darboties. Vai vēlaties to izslēgt?</string>
     <string name="app_modes_choose">Lietotāja režīmi</string>
 	
-    <string name="access_mark_final_location_first">Pieejamības režīms: lūdzu vispirms izvēlieties galamērķi</string> 
     <string name="app_modes_choose_descr">Izvēlētos lietotāja režīmus varēs lietot aplikācijā</string>
     <string name="app_mode_hiking">Iet kājām</string>
     <string name="app_mode_boat">Ūdens transports</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index d8060a8c13..02f3feed82 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -1111,7 +1111,6 @@
     <string name="use_magnetic_sensor">Gebruik magnetische sensor</string>
     <string name="use_kalman_filter_compass_descr">Verminder storingen in het kompas (maakt de kompasweergave langzamer)</string>
     <string name="use_kalman_filter_compass">Gebruik Kalman-filter</string>
-    <string name="access_mark_final_location_first">Toegankelijkheidsmodus: kies eerst een bestemming</string> 
     <string name="local_indexes_cat_srtm">Hoogtelijnen</string>
 	<string name="wait_current_task_finished">Wacht alsjeblieft tot de huidige taak klaar is</string>
     <string name="delete_point">Verwijder punt</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index bb939aea47..2a1dbf14f0 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -1074,7 +1074,6 @@
     <string name="local_indexes_cat_srtm">Poziomice</string>
     <string name="use_kalman_filter_compass_descr">Redukuje szumy w odczytach kompasu, ale zwiększa bezwładność</string>
     <string name="use_kalman_filter_compass">Używanie filtra Kalmana</string>
-    <string name="access_mark_final_location_first">Tryb ułatwień dostępu: wybierz najpierw punkt docelowy</string>
     <string name="wait_current_task_finished">Zaczekaj aż bieżące zadanie zostanie zakończone</string>
     <string name="shared_string_downloading">Pobieranie</string>
     <string name="plugin_distance_point_time">czas</string>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index ffa047296d..1b3e4a193d 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -708,7 +708,6 @@
     <string name="wait_current_task_finished">Aguarde até que a tarefa seja concluída</string>
     <string name="use_kalman_filter_compass_descr">Reduzir o ruído em leituras da bússola, mas acrescenta a inércia</string>
     <string name="use_kalman_filter_compass">Usar filtro de Kalman</string>
-    <string name="access_mark_final_location_first">Modo de acessibilidade: selecione o destino primeiro</string> 
     <string name="use_magnetic_sensor_descr">Usar o sensor magnético para determinar a direção da bússola em vez do sensor de orientação</string>
     <string name="use_magnetic_sensor">Usar sensor magnético</string>
     <string name="other_location">Outro</string>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 09040b4840..2dd699f6cd 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -1171,7 +1171,6 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="wait_current_task_finished">Aguarde até que a tarefa esteja concluída</string>
     <string name="use_kalman_filter_compass_descr">Use filtro Kalman para evitar aberrações na bússola</string>
     <string name="use_kalman_filter_compass">Use filtro Kalman</string>
-    <string name="access_mark_final_location_first">Modo de acessibilidade: selecione o destino primeiro</string> 
     <string name="use_magnetic_sensor_descr">use o sensor magnético para determinar a direção da bússola em vez do sensor de orientação</string>
     <string name="use_magnetic_sensor">Use sensor magnético</string>
     <string name="other_location">Outro</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 9940c2ca03..58a9934b17 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1016,7 +1016,6 @@
 \n* Нажмите и удерживайте на карте, чтобы удалить предыдущую точку.
 \n* Нажмите и удерживайте на точке, чтобы просмотреть и добавить описание.
 \n* Нажмите на виджет измерения, чтобы увидеть больше действий.</string>
-    <string name="access_mark_final_location_first">Режим доступности: Пожалуйста, выберите сначала пункт назначения</string>
     <string name="use_magnetic_sensor_descr">Использовать магнитный датчик вместо датчика ориентации</string>
     <string name="other_location">Другие</string>
     <string name="local_indexes_cat_srtm">Контурные линии</string>
@@ -2010,4 +2009,5 @@
     <string name="access_disable_offroute_recalc_descr">Предотвращает автоматический пересчет маршрута при значительном удалении от заданного пути</string>
     <string name="access_disable_wrong_direction_recalc">Не менять маршрут при неверном направлении движения</string>
     <string name="access_disable_wrong_direction_recalc_descr">Предотвращает автоматический пересчет маршрута при неверном направлении движения</string>
+    <string name="access_no_destination">Пункт назначения не задан</string>
 </resources>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 3152051d0b..60278bde6d 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -216,7 +216,6 @@
     <string name="wait_current_task_finished">Pro praghere iseta sa fine de su traballu presente</string>
     <string name="use_kalman_filter_compass_descr">Minimat s’abbolotu de sa bùssola ma annanghet inèrtzia/preìtia</string>
     <string name="use_kalman_filter_compass">Impreu de su filtru de Kalman</string>
-    <string name="access_mark_final_location_first">Modalidade de atzessu fatzilidadu: issebera in antis sa destinatzione</string>
     <string name="use_magnetic_sensor_descr">Imprea su sensore magneticu pro determinare su balore de sa bùssola imbetzes de su sensore de orientamentu</string>
     <string name="use_magnetic_sensor">Imprea su sensore magneticu (bùssola)</string>
     <string name="other_location">Àtera</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 4fa29d7f19..5942db343f 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -923,7 +923,6 @@
     <string name="wait_current_task_finished">Prosím, čakajte, kým sa dokončí aktuálna úloha</string>
     <string name="use_kalman_filter_compass_descr">Zníži šum v hodnotách z kompasu, ale spomalí zmeny smeru</string>
     <string name="use_kalman_filter_compass">Použiť Kalmanov filter</string>
-    <string name="access_mark_final_location_first">Režim zjednodušeného ovládania: prosím, najskôr vyberte cieľ</string>
     <string name="delete_point">Odstrániť bod</string>
     <string name="plugin_distance_point_time">čas</string>
     <string name="plugin_distance_point_hdop">presnosť</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 7e64730418..cfcbe01c91 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -1085,7 +1085,6 @@
     <string name="wait_current_task_finished">Počakajte na končanje trenutne naloge</string>
     <string name="use_kalman_filter_compass_descr">Kalmanov filter je algoritem za ocenjevanje odstopanj položaja kompasa</string>
     <string name="use_kalman_filter_compass">Uporabi Kalmanov filter</string>
-    <string name="access_mark_final_location_first">Način dostopnosti: najprej je treba izbrati cilj</string>
     <string name="use_magnetic_sensor_descr">Za določanje vrednosti kompasa je treba namesto tipala za usmerjevanje uporabiti magnetno tipalo</string>
     <string name="cancel_route">Opusti pot</string>
     <string name="monitoring_settings_descr">Nastavitve beleženja potovanj in poti</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index ab18705cb6..1671044783 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1018,7 +1018,6 @@
     <string name="choose_osmand_theme">App-tema</string>
     <string name="choose_osmand_theme_descr">Välj tema för applikationen</string>
     <string name="use_magnetic_sensor_descr">Använd magnetisk sensor för att bestämma kompassvärde i stället för orienteringssensor</string>
-    <string name="access_mark_final_location_first">Tillgänglighetsläge: välj destination först</string>
     <string name="accessibility_options">Tillgänglighetsalternativ</string>
     <string name="select_address_activity">Välj adress</string>
     <string name="favourites_list_activity">Välj favorit</string>
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 2e9abd8a7d..aa6695b7fb 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -768,7 +768,6 @@
     <string name="wait_current_task_finished">Mevcut görev bitene kadar bekleyin lütfen</string>
     <string name="use_kalman_filter_compass_descr">Pusula sapmalarından korunmak için Kalman filtresi kullan</string>
     <string name="use_kalman_filter_compass">Kalman filtresi kullan</string>
-    <string name="access_mark_final_location_first">Erişilebilirlik modu : lütfen önce varış noktası seçin</string> 
     <string name="use_magnetic_sensor_descr">pusula değerini belirlemek için yönlendirme sensörü yerine manyetik sensörü kullan</string>
     <string name="use_magnetic_sensor">Manyetik sensörü kullan</string>
     <string name="other_location">Diğer</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 5c50d51fd8..89bd72bf09 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -1274,7 +1274,6 @@ OsmAnd має відкриті сирці і активно розвиваєть
        * Натисніть та утримуйте мапу для вилучення попередньої точки.\n
        * Натисніть та утримуйте точку для перегляду та додавання опису.\n
        * Натисніть на масштабну лінійку, щоб побачити більше дій.</string>
-    <string name="access_mark_final_location_first">Допоміжні можливості: будь ласка, спочатку оберіть пункт призначення</string> 
     <string name="use_magnetic_sensor_descr">Використовувати магнітометр для визначення сторін світу замість, датчику орієнтації</string>
     
 	<string name="destination_point">Пункт призначення %1$s</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 90853b1b9f..6ee4a44657 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -976,7 +976,6 @@
     <string name="recording_context_menu_arecord">錄取音訊附註</string>
     <string name="destination_point">目的地 ％1$S</string>
     <string name="local_osm_changes_backup_successful">OSM 變更的檔案已成功的產生 %1$s</string>
-    <string name="access_mark_final_location_first">無障礙模式：首先請選擇目的地</string>
     <string name="av_use_external_recorder_descr">視訊使用系統錄製</string>
     <string name="av_use_external_recorder">使用系統錄製</string>
     <string name="av_use_external_camera_descr">使用系統應用程式拍照</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 1bbebedb1e..b87ab1b4fc 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -10,6 +10,7 @@
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
 
+    <string name="access_no_destination">Destination is not set</string>
     <string name="map_widget_magnetic_bearing">Magnetic bearing</string>
     <string name="map_widget_bearing">Relative bearing</string>
     <string name="access_disable_offroute_recalc">Don\'t change route when you are off the way</string>
@@ -1052,7 +1053,6 @@
     <string name="wait_current_task_finished">Please wait until current task is finished</string>
     <string name="use_kalman_filter_compass_descr">Reduces noise in compass readings but adds inertia</string>
     <string name="use_kalman_filter_compass">Use Kalman filter</string>
-    <string name="access_mark_final_location_first">Accessibility mode: please select destination first</string>
     <string name="use_magnetic_sensor_descr">Use magnetic sensor to determine compass value instead of orientation sensor</string>
     <string name="use_magnetic_sensor">Use magnetic sensor</string>
     <string name="other_location">Other</string>
diff --git a/OsmAnd/src/net/osmand/access/MapAccessibilityActions.java b/OsmAnd/src/net/osmand/access/MapAccessibilityActions.java
index 0bd7e772c7..8ce7169477 100644
--- a/OsmAnd/src/net/osmand/access/MapAccessibilityActions.java
+++ b/OsmAnd/src/net/osmand/access/MapAccessibilityActions.java
@@ -1,12 +1,9 @@
 package net.osmand.access;
 
-import net.osmand.data.LatLon;
+import android.graphics.PointF;
+
 import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.views.ContextMenuLayer;
-import net.osmand.plus.views.OsmandMapTileView;
-import android.graphics.PointF;
-import android.os.Build;
 
 // Accessibility actions for map view.
 public class MapAccessibilityActions implements AccessibilityActionsProvider {
@@ -19,15 +16,19 @@ public class MapAccessibilityActions implements AccessibilityActionsProvider {
 
     @Override
     public boolean onClick(PointF point, RotatedTileBox tileBox) {
-        if ((Build.VERSION.SDK_INT >= 14) && activity.getMyApplication().accessibilityEnabled()) {
-        	// not sure if it is very clear why should I mark destination first when I tap on the object
-        	return activity.getMyApplication().getLocationProvider().emitNavigationHint();
+        if (activity.getMyApplication().accessibilityEnabled()) {
+            activity.getMyApplication().getLocationProvider().emitNavigationHint();
+            return true;
         }
         return false;
     }
 
     @Override
     public boolean onLongClick(PointF point, RotatedTileBox tileBox) {
+        if (activity.getMyApplication().accessibilityEnabled() && activity.getMapViewTrackingUtilities().isMapLinkedToLocation()) {
+            activity.getMapLayers().getContextMenuLayer().showContextMenu(tileBox.getLatitude(), tileBox.getLongitude(), true);
+            return true;
+        }
         return false;
     }
 
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java
index 9cb39792d6..438f89df5a 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java
@@ -836,7 +836,7 @@ public class OsmAndLocationProvider implements SensorEventListener {
 		return hint;
 	}
 
-	public boolean emitNavigationHint() {
+	public void emitNavigationHint() {
 		final TargetPoint point = app.getTargetPointsHelper().getPointToNavigate();
 		if (point != null) {
 			if (app.getRoutingHelper().isRouteCalculated()) {
@@ -844,10 +844,8 @@ public class OsmAndLocationProvider implements SensorEventListener {
 			} else {
 				app.showToastMessage(getNavigationHint(point));
 			}
-			return true;
 		} else {
-			app.showShortToastMessage(R.string.access_mark_final_location_first);
-			return false;
+			app.showShortToastMessage(R.string.access_no_destination);
 		}
 	}