summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml6
-rw-r--r--res/values/themes.xml7
2 files changed, 7 insertions, 6 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6129a0d9..bc469f08 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -765,6 +765,12 @@
<!-- Label when there are no apps available for a default app [CHAR LIMIT=30] -->
<string name="default_app_no_apps">No apps</string>
+ <!-- Label for the selected default app for default app [CHAR LIMIT=30] -->
+ <string name="car_default_app_selected">Selected</string>
+
+ <!-- Label for the selected default app for default app when it has additional information to show [CHAR LIMIT=30] -->
+ <string name="car_default_app_selected_with_info">Selected - <xliff:g id="additional_info" example="(System default)">%1$s</xliff:g></string>
+
<!-- Keyword in the Settings app's search functionality that can be used to find links to the special app access management screens [CHAR LIMIT=none] -->
<string name="special_app_access_search_keyword">special app access</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 848cd78a..1f064bda 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -23,11 +23,6 @@
<item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle</item>
</style>
- <style name="Settings.NoActionBar" parent="Settings">
- <item name="android:windowActionBar">false</item>
- <item name="android:windowNoTitle">true</item>
- </style>
-
<style name="TextAppearance.CategoryTitle"
parent="@android:style/TextAppearance.DeviceDefault.Medium">
<item name="android:textAllCaps">true</item>
@@ -84,7 +79,7 @@
parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar">
</style>
- <style name="CarSettings" parent="Settings.NoActionBar">
+ <style name="CarSettings" parent="@android:style/Theme.DeviceDefault.NoActionBar">
<item name="preferenceTheme">@style/CarPreferenceTheme</item>
<item name="carDividerColor">@*android:color/car_list_divider</item>
</style>