From 8bf32b30e9c8c751db4ed487566e9813264f3b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joris=20Pelgr=C3=B6m?= Date: Sun, 9 Jul 2023 23:31:27 +0200 Subject: [PATCH] Minor update to Auto(motive) login screen (#3647) --- .../companion/android/vehicle/LoginScreen.kt | 9 +++++---- common/src/main/res/values/strings.xml | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/homeassistant/companion/android/vehicle/LoginScreen.kt b/app/src/main/java/io/homeassistant/companion/android/vehicle/LoginScreen.kt index b6cc5c8e27..4dd383e53c 100644 --- a/app/src/main/java/io/homeassistant/companion/android/vehicle/LoginScreen.kt +++ b/app/src/main/java/io/homeassistant/companion/android/vehicle/LoginScreen.kt @@ -5,6 +5,7 @@ import android.content.pm.PackageManager import androidx.car.app.CarContext import androidx.car.app.Screen import androidx.car.app.model.Action +import androidx.car.app.model.CarIcon import androidx.car.app.model.MessageTemplate import androidx.car.app.model.ParkedOnlyOnClickListener import androidx.car.app.model.Template @@ -42,17 +43,17 @@ class LoginScreen(context: CarContext, val serverManager: ServerManager) : Scree } override fun onGetTemplate(): Template { - return MessageTemplate.Builder(carContext.getString(R.string.aa_app_not_logged_in)) - .setTitle(carContext.getString(R.string.app_name)) - .setHeaderAction(Action.APP_ICON) + return MessageTemplate.Builder(carContext.getString(R.string.welcome_hass)) + .setIcon(CarIcon.APP_ICON) .addAction( Action.Builder() - .setTitle(carContext.getString(R.string.login)) + .setTitle(carContext.getString(if (isAutomotive) R.string.login else R.string.login_on_phone)) .setOnClickListener( ParkedOnlyOnClickListener.create { startNativeActivity() } ) + .setFlags(Action.FLAG_PRIMARY) .build() ) .build() diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 7be7f80359..b50a9622b4 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -342,6 +342,7 @@ Logbook Logged in Login + Login on your phone Login Wear OS Device Logout Dashboard View or Dashboard