feat:

tzebrowski · Sep 7, 2023 · d330d89 · d330d89
1 parent c6d794b
commit d330d89
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 0 deletions.
diff --git a/automotive/src/main/AndroidManifest.xml b/automotive/src/main/AndroidManifest.xml
@@ -24,7 +24,16 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="androidx.car.app.CarAppService" />
+                <category android:name="androidx.car.app.category.NAVIGATION"/>
+                <category android:name="androidx.car.app.category.FEATURE_CLUSTER"/>
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="androidx.car.app.action.NAVIGATE" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:scheme="geo" />
+            </intent-filter>
+
         </service>
     </application>
 </manifest>
diff --git a/automotive/src/main/java/org/obd/graphs/aa/CarScreen.kt b/automotive/src/main/java/org/obd/graphs/aa/CarScreen.kt
@@ -9,6 +9,8 @@ import android.util.Log
 import androidx.car.app.CarContext
 import androidx.car.app.Screen
 import androidx.car.app.model.*
+import androidx.car.app.navigation.NavigationManager
+import androidx.car.app.navigation.NavigationManagerCallback
 import androidx.car.app.navigation.model.NavigationTemplate
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.DefaultLifecycleObserver
@@ -20,6 +22,7 @@ import org.obd.graphs.renderer.DynamicSelectorMode
 import org.obd.graphs.renderer.Fps
 import org.obd.graphs.renderer.ScreenSettings
 
+
 private const val LOG_KEY = "CarScreen"
 private const val VIRTUAL_SCREEN_1_SETTINGS_CHANGED = "pref.aa.pids.profile_1.event.changed"
 private const val VIRTUAL_SCREEN_2_SETTINGS_CHANGED = "pref.aa.pids.profile_2.event.changed"
@@ -138,13 +141,15 @@ internal class CarScreen(
                     surfaceController.renderFrame()
                     fps.stop()
                     invalidate()
+                    navigationManager().navigationEnded()
                 }
 
                 DATA_LOGGER_CONNECTED_EVENT -> {
                     toast.show(carContext, R.string.main_activity_toast_connection_established)
                     renderingThread.start()
                     fps.start()
                     invalidate()
+                    navigationManager().navigationStarted()
                 }
 
                 DATA_LOGGER_STOPPING_EVENT -> {
@@ -303,6 +308,7 @@ internal class CarScreen(
         }
 
     init {
+
         lifecycle.addObserver(this)
         dataLogger.observe(this) {
             metricsCollector.append(it)
@@ -314,5 +320,26 @@ internal class CarScreen(
         } else {
             Log.i(LOG_KEY, "Data logger is not running.")
         }
+
+        navigationManager().setNavigationManagerCallback(
+            object : NavigationManagerCallback {
+                override fun onStopNavigation() {
+
+                    try {
+                        renderingThread.stop()
+                        surfaceController.renderFrame()
+                        fps.stop()
+                        invalidate()
+                    }catch (e: Throwable){
+                        Log.e(LOG_KEY,"Failed to stop DL threads",e)
+                    }
+                }
+
+                override fun onAutoDriveEnabled() {
+
+                }
+            })
     }
+
+    private fun navigationManager() = carContext.getCarService(NavigationManager::class.java)
 }
diff --git a/automotive/src/main/java/org/obd/graphs/aa/CarService.kt b/automotive/src/main/java/org/obd/graphs/aa/CarService.kt
@@ -10,6 +10,7 @@ import androidx.car.app.validation.HostValidator
 internal class CarService : CarAppService() {
     override fun onCreateSession(): Session = CarSession()
     override fun createHostValidator(): HostValidator {
+
         return if (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0) {
             HostValidator.ALLOW_ALL_HOSTS_VALIDATOR
         } else {