TRACKING APP: remove magnetic heading, only keep course over ground, with declination mode

mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml

@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:paddingLeft="10dp"
         android:layout_alignParentTop="true"
-        android:text="@string/heading"
+        android:text="@string/course_over_ground"
         android:textColor="@android:color/darker_gray"
         android:textSize="15sp"
         android:paddingTop="15dp" 

mobile/com.sap.sailing.android.tracking.app/res/values-de/preferences.xml

@@ -7,9 +7,9 @@
     <string name="preference_energy_saving_is_disabled">Aus</string>
     <string name="prefrence_energy_saving_summary_is_enabled">GPS Updates werden alle 30 Sekunden verschickt.</string>
     <string name="prefrence_energy_saving_summary_is_disabled">GPS Updates werden alle 3 Sekunden verschickt.</string>
-    <string name="preference_heading_from_magnetic_key_is_enabled">magn.</string>
-    <string name="preference_heading_from_magnetic_key_is_disabled">GPS</string>
-    <string name="preference_heading_from_magnetic_key_summary_is_enabled">Richtung stammt vom Magnetkompass</string>
-    <string name="preference_heading_from_magnetic_key_summary_is_disabled">Richtung stammt vom GPS</string>
-    <string name="preference_heading_from_magnetic_enabled">Richtung</string>
-</resources>
+    <string name="preference_heading_with_declination_key_is_enabled">Ein</string>
+    <string name="preference_heading_with_declination_key_is_disabled">Aus</string>
+    <string name="preference_heading_with_declination_key_summary_is_enabled">Anzeige: Magnetkompasskurs + Ablenkung</string>
+    <string name="preference_heading_with_declination_key_summary_is_disabled">Anzeige: Magnetkompasskurs</string>
+    <string name="preference_heading_with_declination_enabled">Richtung</string>
+</resources>

mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml

@@ -80,6 +80,7 @@
 	<string name="hud_heading_prefix">HDG: </string>
 	<string name="hud_speed_over_ground_prefix">SPD: </string>
 	<string name="heading">Kurs</string>
+	<string name="course_over_ground">Course over Ground</string>
 	<string name="sog">SOG</string>
 	<string name="none">Keine</string>
 	<string name="show_leaderboard">Leaderboard</string>

mobile/com.sap.sailing.android.tracking.app/res/values/preferences.xml

@@ -10,7 +10,7 @@
     <string name="preference_server_url_default">http://95.85.58.11:8000</string>
     
     <string name="preference_energy_saving_enabled_key">preferenceEnergySavingEnabled</string>
-    <string name="preference_heading_from_magnetic_key">preferenceHeadingFromMagneticKey</string>
+    <string name="preference_heading_with_declination">preferenceHeadingWithDeclination</string>
     
     <string name="settings_category_energy_saving">Battery Saving</string>
     <string name="energy_saving_enabled">Save Energy</string>
@@ -29,9 +29,9 @@
     <string name="preference_tracker_is_tracking_checkin_digest">trackerIsTrackingCheckinDigest</string>
     <string name="preference_last_scanned_qr_code">lastScannedQRCode</string>
     
-    <string name="preference_heading_from_magnetic_key_is_enabled">magn.</string>
-    <string name="preference_heading_from_magnetic_key_is_disabled">GPS</string>
-    <string name="preference_heading_from_magnetic_key_summary_is_enabled">Heading from magnetic compass</string>
-    <string name="preference_heading_from_magnetic_key_summary_is_disabled">Heading from GPS</string>
-    <string name="preference_heading_from_magnetic_enabled">Heading</string>
+    <string name="preference_heading_with_declination_key_is_enabled">On</string>
+    <string name="preference_heading_with_declination_key_is_disabled">Off</string>
+    <string name="preference_heading_with_declination_key_summary_is_enabled">Display: Magnetic + Declination</string>
+    <string name="preference_heading_with_declination_key_summary_is_disabled">Display: Magnetic</string>
+    <string name="preference_heading_with_declination_enabled">Heading</string>
 </resources>

mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml

@@ -68,6 +68,7 @@
 	<string name="tracking_colon">Tracking:</string>
 	<string name="regatta_in_progress">The regatta is in progress.</string>
 	<string name="heading">Heading</string>
+	<string name="course_over_ground">Course over Ground</string>
 	<string name="sog">Speed over Ground</string>
 	<string name="none">None</string>
 	<string name="show_leaderboard">Leader board</string>

mobile/com.sap.sailing.android.tracking.app/res/xml/preference_general.xml

@@ -23,12 +23,12 @@
         
          <SwitchPreference
             android:defaultValue="true"
-            android:key="@string/preference_heading_from_magnetic_key"
-            android:switchTextOn="@string/preference_heading_from_magnetic_key_is_enabled"
-            android:switchTextOff="@string/preference_heading_from_magnetic_key_is_disabled"
-            android:summaryOn="@string/preference_heading_from_magnetic_key_summary_is_enabled"
-            android:summaryOff="@string/preference_heading_from_magnetic_key_summary_is_disabled"
-            android:title="@string/preference_heading_from_magnetic_enabled" />
+            android:key="@string/preference_heading_with_declination"
+            android:switchTextOn="@string/preference_heading_with_declination_key_is_enabled"
+            android:switchTextOff="@string/preference_heading_with_declination_key_is_disabled"
+            android:summaryOn="@string/preference_heading_with_declination_key_summary_is_enabled"
+            android:summaryOff="@string/preference_heading_with_declination_key_summary_is_disabled"
+            android:title="@string/preference_heading_with_declination_enabled" />
     </PreferenceCategory>