Fossil/Skagen Hybrids: Update navigationApp to 1.1

Changes:
- Support locking (keep visible and let hands display time)
- Support merge navigation instruction
- Support wrist flick gesture to move hands
- Support GB-configurable foreground and vibration behaviour

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java

@@ -39,7 +39,7 @@ public final class QHybridConstants {
             put("weatherApp", "3.11");
             put("wellnessApp", "3.16");
             put("AlexaApp", "3.11");
-            put("navigationApp", "1.0");
+            put("navigationApp", "1.1");
         }
     };
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java

@@ -2082,6 +2082,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
     }
 
     public void onSetNavigationInfo(NavigationInfoSpec navigationInfoSpec) {
+        SharedPreferences prefs = getDeviceSpecificPreferences();
         String installedAppsJson = getDeviceSupport().getDevice().getDeviceInfo("INSTALLED_APPS").getDetails();
         if (installedAppsJson == null || !installedAppsJson.contains("navigationApp")) {
             if (!notifiedAboutMissingNavigationApp) {
@@ -2106,6 +2107,8 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
                                             .put("eta", navigationInfoSpec.ETA)
                                             .put("instruction", navigationInfoSpec.instruction)
                                             .put("nextAction", navigationInfoSpec.nextAction)
+                                            .put("autoFg", prefs.getBoolean("fossil_hr_nav_auto_foreground", true))
+                                            .put("vibrate", prefs.getBoolean("fossil_hr_nav_vibrate", true))
                                     )
                             )
                     );

app/src/main/res/drawable/baseline_merge_24.xml

@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path android:fillColor="#000000" android:pathData="M6.41,21L5,19.59l4.83,-4.83c0.75,-0.75 1.17,-1.77 1.17,-2.83v-5.1L9.41,8.41L8,7l4,-4l4,4l-1.41,1.41L13,6.83v5.1c0,1.06 0.42,2.08 1.17,2.83L19,19.59L17.59,21L12,15.41L6.41,21z"/>
+</vector>

app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml

@@ -131,4 +131,25 @@
             android:targetClass="nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.CalibrationActivity" />
     </Preference>
 
+    <PreferenceScreen
+        android:icon="@drawable/baseline_merge_24"
+        android:title="Navigation instructions"
+        android:summary="Configure on-watch navigation app behavior"
+        android:key="navigation_app_config">
+
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="fossil_hr_nav_auto_foreground"
+            android:title="Come to foreground"
+            android:summary="Whether the navigation app should automatically come to the foreground when it receives a navigation instruction"
+            android:icon="@drawable/ic_info"/>
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="fossil_hr_nav_vibrate"
+            android:title="Vibrate on new instruction"
+            android:summary="Whether the watch should vibrate on every new or changed navigation instruction (only when the app is in the foreground)"
+            android:icon="@drawable/ic_action_find_lost_device"/>
+
+    </PreferenceScreen>
+
 </androidx.preference.PreferenceScreen>