From 2863d06d42e341b519d3aadd1df47ce36cd9cb32 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 20 May 2013 23:33:16 +0200
Subject: [PATCH] Fix compass issue

---
 OsmAnd/res/values/strings.xml                                 | 4 +++-
 OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java        | 3 ---
 .../net/osmand/plus/activities/SettingsGeneralActivity.java   | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 47b6bde5ce..0a1b6b3e96 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -8,7 +8,9 @@
          If you are making/correcting English translations make sure:
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     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="use_magnetic_sensor_descr">Use magnetic sensor to determine compass value instead of orientation sensor</string>
+    <string name="use_magnetic_sensor">Use magnetic sensor (compass)</string>
     <string name="other_location">Other</string>
     <string name="files_limit">%1$d files left</string>
     <string name="available_downloads_left">Available %1$d files to download</string>
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java
index 5762a9db0d..e5f71008be 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java
@@ -285,9 +285,6 @@ public class OsmAndLocationProvider implements SensorEventListener {
 					break;
 				case Sensor.TYPE_ORIENTATION:
 					val = event.values[0];
-					if (USE_MAGNETIC_FIELD_SENSOR_COMPASS.get()) {
-						return;
-					}
 					break;
 				default:
 					return;
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index ef8801cd95..182e620bbf 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -113,6 +113,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 			screen.addPreference(applicationDir);
 		}
 		
+		screen.addPreference(createCheckBoxPreference(settings.USE_MAGNETIC_FIELD_SENSOR_COMPASS, R.string.use_magnetic_sensor, R.string.use_magnetic_sensor_descr));
+		
 		registerBooleanPreference(settings.USE_ENGLISH_NAMES, screen);
 		registerBooleanPreference(settings.LEFT_SIDE_NAVIGATION, screen);