From 2f93e92b575318f6f90aa3edcd8b70e486245f90 Mon Sep 17 00:00:00 2001 From: johan12345 Date: Mon, 22 Aug 2022 22:47:49 +0200 Subject: [PATCH] Android Auto: Use more appropriate title for place search data source selection screen --- .../google/java/net/vonforst/evmap/auto/SettingsScreens.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/google/java/net/vonforst/evmap/auto/SettingsScreens.kt b/app/src/google/java/net/vonforst/evmap/auto/SettingsScreens.kt index 1297902f..9f806491 100644 --- a/app/src/google/java/net/vonforst/evmap/auto/SettingsScreens.kt +++ b/app/src/google/java/net/vonforst/evmap/auto/SettingsScreens.kt @@ -1,5 +1,6 @@ package net.vonforst.evmap.auto +import androidx.annotation.StringRes import androidx.car.app.CarContext import androidx.car.app.CarToast import androidx.car.app.Screen @@ -107,6 +108,7 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) { screenManager.push( ChooseDataSourceScreen( carContext, + R.string.pref_data_source, dataSourceNames, dataSourceValues, prefs.dataSource, @@ -127,6 +129,7 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) { screenManager.push( ChooseDataSourceScreen( carContext, + R.string.pref_search_provider, searchProviderNames, searchProviderValues, prefs.searchProvider @@ -155,6 +158,7 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) { class ChooseDataSourceScreen( ctx: CarContext, + @StringRes val title: Int, val names: Array, val values: Array, val currentValue: String, @@ -165,7 +169,7 @@ class ChooseDataSourceScreen( override fun onGetTemplate(): Template { return ListTemplate.Builder().apply { - setTitle(carContext.getString(R.string.pref_data_source)) + setTitle(carContext.getString(title)) setHeaderAction(Action.BACK) setSingleList(ItemList.Builder().apply { for (i in names.indices) {