Fix debug app titles not being visible
Bug: 255850894
Test: manual
Change-Id: Ie49f5b4ab3c85e7e1e49003259c88aad5690fa58
diff --git a/packages/CarDeveloperOptions/AndroidManifest.xml b/packages/CarDeveloperOptions/AndroidManifest.xml
index 8a98780..5850d3e 100644
--- a/packages/CarDeveloperOptions/AndroidManifest.xml
+++ b/packages/CarDeveloperOptions/AndroidManifest.xml
@@ -22,8 +22,9 @@
android:sharedUserId="android.uid.system">
<application android:label="@string/development_settings_title"
+ android:theme="@style/Theme.CDOBaseTheme"
tools:node="merge"
- tools:replace="android:label">
+ tools:replace="android:label,android:theme">
<activity
android:name=".CarDevelopmentSettingsDashboardActivity"
diff --git a/packages/CarDeveloperOptions/res/values/themes.xml b/packages/CarDeveloperOptions/res/values/themes.xml
index 43887b3..1eea0e7 100644
--- a/packages/CarDeveloperOptions/res/values/themes.xml
+++ b/packages/CarDeveloperOptions/res/values/themes.xml
@@ -39,6 +39,13 @@
<item name="buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
</style>
+ <!-- Base settings application theme with minor modifications for visibility -->
+ <style name="Theme.CDOBaseTheme" parent="@style/Theme.Settings">
+ <item name="android:textAppearanceListItem">@style/CDOTitleTextAppearance</item>
+ <item name="android:textColor">@*android:color/car_body1</item>
+ <item name="android:textColorSecondary">@*android:color/car_body1</item>
+ </style>
+
<style name="Theme.SubSettings" parent="@android:style/Theme.DeviceDefault.NoActionBar">
<item name="alertDialogTheme">@style/Theme.AlertDialog</item>
<item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
@@ -57,15 +64,20 @@
<style name="Theme.CarDeveloperOptions" parent="@style/Theme.CarUi.WithToolbar">
<item name="alertDialogTheme">@style/Theme.AlertDialog</item>
<item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
- <item name="preferenceTheme">@style/CarDeveloperOptionsPreferenceTheme</item>
+ <item name="preferenceTheme">@style/CDOPreferenceTheme</item>
</style>
- <style name="CarDeveloperOptionsPreferenceTheme" parent="@style/CarUiPreferenceTheme">
- <item name="preferenceFragmentCompatStyle">@style/CarDeveloperOptionsPreferenceFragment</item>
- <item name="preferenceFragmentStyle">@style/CarDeveloperOptionsPreferenceFragment</item>
+ <style name="CDOPreferenceTheme" parent="@style/CarUiPreferenceTheme">
+ <item name="preferenceFragmentCompatStyle">@style/CDOPreferenceFragment</item>
+ <item name="preferenceFragmentStyle">@style/CDOPreferenceFragment</item>
</style>
- <style name="CarDeveloperOptionsPreferenceFragment" parent="@style/PreferenceFragment.CarUi">
+ <style name="CDOPreferenceFragment" parent="@style/PreferenceFragment.CarUi">
<item name="android:layout">@layout/preference_list_fragment</item>
</style>
-</resources>
\ No newline at end of file
+
+ <style name="CDOTitleTextAppearance" parent="@android:style/TextAppearance.DeviceDefault">
+ <item name="android:textSize">@*android:dimen/car_body2_size</item>
+ <item name="android:textColor">@*android:color/car_body1</item>
+ </style>
+</resources>
