Add action to open Settings View from Automotive main screen (#6834)

Author: cddu33

app/src/main/kotlin/io/homeassistant/companion/android/util/vehicle/SettingsAction.kt

@@ -0,0 +1,51 @@
+package io.homeassistant.companion.android.util.vehicle
+
+import android.app.ActivityOptions
+import android.content.Intent
+import android.os.Build
+import android.view.Display
+import androidx.car.app.CarContext
+import androidx.car.app.model.Action
+import androidx.car.app.model.CarColor
+import androidx.car.app.model.CarIcon
+import com.mikepenz.iconics.IconicsDrawable
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.utils.sizeDp
+import com.mikepenz.iconics.utils.toAndroidIconCompat
+import io.homeassistant.companion.android.settings.SettingsActivity
+import timber.log.Timber
+
+fun settingsAction(carContext: CarContext): Action {
+    return Action.Builder()
+        .setIcon(
+            CarIcon.Builder(
+                IconicsDrawable(carContext, CommunityMaterial.Icon.cmd_cog).apply {
+                    sizeDp = 64
+                }.toAndroidIconCompat(),
+            )
+                .setTint(CarColor.DEFAULT)
+                .build(),
+        )
+        .setOnClickListener {
+            startSettingsActivity(carContext)
+        }.build()
+}
+
+private fun startSettingsActivity(carContext: CarContext) {
+    Timber.d("Starting settings activity")
+    // The app must indicate the default display to be used to avoid a SecurityException on newer
+    // Android versions. See: https://developer.android.com/training/cars/platforms/releases#android-14
+    val options = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+        ActivityOptions.makeBasic()
+            .setLaunchDisplayId(Display.DEFAULT_DISPLAY)
+            .toBundle()
+    } else {
+        null
+    }
+    carContext.startActivity(
+        SettingsActivity.newInstance(carContext).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        },
+        options,
+    )
+}

app/src/main/kotlin/io/homeassistant/companion/android/vehicle/BaseVehicleScreen.kt

@@ -12,9 +12,9 @@ import timber.log.Timber
 abstract class BaseVehicleScreen(carContext: CarContext) : Screen(carContext) {
     private var car: Car? = null
     private var carRestrictionManager: CarUxRestrictionsManager? = null
-    protected val isDrivingOptimized
+    protected val isDrivingOptimized: Boolean
         get() = try {
-            (car?.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE) as? CarUxRestrictionsManager)
+            carRestrictionManager
                 ?.currentCarUxRestrictions
                 ?.isRequiresDistractionOptimization
                 ?: false
@@ -32,6 +32,7 @@ abstract class BaseVehicleScreen(carContext: CarContext) : Screen(carContext) {
 
             override fun onPause(owner: LifecycleOwner) {
                 carRestrictionManager?.unregisterListener()
+                carRestrictionManager = null
                 car?.disconnect()
                 car = null
             }
@@ -51,6 +52,7 @@ abstract class BaseVehicleScreen(carContext: CarContext) : Screen(carContext) {
                     onDrivingOptimizedChanged(restrictions.isRequiresDistractionOptimization)
                 }
             carRestrictionManager?.registerListener(listener)
+            invalidate()
         }
     }
 }

app/src/main/kotlin/io/homeassistant/companion/android/vehicle/DomainListScreen.kt

@@ -17,6 +17,7 @@ import io.homeassistant.companion.android.util.vehicle.SUPPORTED_DOMAINS
 import io.homeassistant.companion.android.util.vehicle.getDomainList
 import io.homeassistant.companion.android.util.vehicle.getHeaderBuilder
 import io.homeassistant.companion.android.util.vehicle.nativeModeAction
+import io.homeassistant.companion.android.util.vehicle.settingsAction
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
@@ -71,8 +72,11 @@ class DomainListScreen(
 
         return GridTemplate.Builder().apply {
             val headerBuilder = carContext.getHeaderBuilder(R.string.all_entities)
-            if (isAutomotive && !isDrivingOptimized && BuildConfig.FLAVOR != "full") {
-                headerBuilder.addEndHeaderAction(nativeModeAction(carContext))
+            if (isAutomotive && !isDrivingOptimized) {
+                if (BuildConfig.FLAVOR != "full") {
+                    headerBuilder.addEndHeaderAction(nativeModeAction(carContext))
+                }
+                headerBuilder.addEndHeaderAction(settingsAction(carContext))
             }
             setHeader(headerBuilder.build())
             val domainBuild = domainList.build()

app/src/main/kotlin/io/homeassistant/companion/android/vehicle/MainVehicleScreen.kt

@@ -32,6 +32,7 @@ import io.homeassistant.companion.android.util.vehicle.getDomainList
 import io.homeassistant.companion.android.util.vehicle.getHeaderBuilder
 import io.homeassistant.companion.android.util.vehicle.getNavigationGridItem
 import io.homeassistant.companion.android.util.vehicle.nativeModeAction
+import io.homeassistant.companion.android.util.vehicle.settingsAction
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
@@ -217,8 +218,11 @@ class MainVehicleScreen(
             }.build()
 
         val headerBuilder = carContext.getHeaderBuilder(commonR.string.app_name, Action.APP_ICON)
-        if (isAutomotive && !isDrivingOptimized && BuildConfig.FLAVOR != "full") {
-            headerBuilder.addEndHeaderAction(nativeModeAction(carContext))
+        if (isAutomotive && !isDrivingOptimized) {
+            if (BuildConfig.FLAVOR != "full") {
+                headerBuilder.addEndHeaderAction(nativeModeAction(carContext))
+            }
+            headerBuilder.addEndHeaderAction(settingsAction(carContext))
         }
         headerBuilder.addEndHeaderAction(refreshAction)