commit 4d15bf52b9a991052fefab5bf286b6f19cbde55c
author Roberto Perez <robertoalexis@google.com> Thu Dec 20 18:50:35 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 20 18:50:35 2018 +0000
tree cd5b6851364d049af2a58259697b3a19c30565fd
parent 355c3168d632dd6988a855407a8a383dcea4f69a
parent 2e1dcb3750818d32ec4bd9835d8864b9eefb4d69

Merge "Monitoring the launched navigation app"

car_product/overlay/frameworks/base/core/res/res/values/themes_device_defaults.xml

diff --git a/car_product/overlay/frameworks/base/core/res/res/values/themes_device_defaults.xml b/car_product/overlay/frameworks/base/core/res/res/values/themes_device_defaults.xml
index 3a82dd3..228079e 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values/themes_device_defaults.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values/themes_device_defaults.xml
@@ -20,7 +20,6 @@
 -->
 <resources>
     <style name="Theme.DeviceDefault" parent="Theme.DeviceDefaultBase">
-        <item name="background">@null</item>
         <item name="borderlessButtonStyle">@style/Widget.DeviceDefault.Button.Borderless.Colored</item>
         <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
         <item name="buttonStyle">@style/Widget.DeviceDefault.Button</item>
@@ -43,12 +42,20 @@
         <item name="textAppearanceListItemSmall">@style/TextAppearance.DeviceDefault.Large</item>
         <item name="textAppearanceListItemSecondary">@style/TextAppearance.DeviceDefault.Small</item>
     </style>
-    <style name="Theme.DeviceDefault.Dialog" parent="Theme.Material.Dialog" >
+    <style name="Theme.DeviceDefault.Dialog" parent="Theme.Material.Dialog">
+        <item name="textAppearanceLarge">@style/TextAppearance.DeviceDefault.Large</item>
+        <item name="textAppearanceMedium">@style/TextAppearance.DeviceDefault.Medium</item>
+        <item name="textAppearanceSmall">@style/TextAppearance.DeviceDefault.Small</item>
+        <item name="textAppearanceLargeInverse">@style/TextAppearance.DeviceDefault.Large.Inverse</item>
+        <item name="textAppearanceMediumInverse">@style/TextAppearance.DeviceDefault.Medium.Inverse</item>
+        <item name="textAppearanceSmallInverse">@style/TextAppearance.DeviceDefault.Small.Inverse</item>
+        <item name="textAppearanceListItem">@style/TextAppearance.DeviceDefault.Large</item>
+        <item name="textAppearanceListItemSmall">@style/TextAppearance.DeviceDefault.Large</item>
+        <item name="textAppearanceListItemSecondary">@style/TextAppearance.DeviceDefault.Small</item>
         <item name="borderlessButtonStyle">@style/Widget.DeviceDefault.Button.Borderless.Colored</item>
         <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
         <item name="buttonStyle">@style/Widget.DeviceDefault.Button</item>
         <item name="colorAccent">@color/accent_device_default_light</item>
-        <item name="colorBackground">@color/background_device_default_light</item>
         <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item>
         <item name="colorButtonNormal">@color/car_highlight</item>
         <item name="colorControlHighlight">@color/car_card_ripple_background</item>
@@ -61,9 +68,6 @@
         <item name="textColorPrimary">@color/car_body1</item>
         <item name="textColorSecondary">@color/car_body2</item>
         <item name="toastFrameBackground">@drawable/toast_frame</item>
-        <item name="textAppearanceListItem">@style/TextAppearance.DeviceDefault.Large</item>
-        <item name="textAppearanceListItemSmall">@style/TextAppearance.DeviceDefault.Large</item>
-        <item name="textAppearanceListItemSecondary">@style/TextAppearance.DeviceDefault.Small</item>
     </style>
     <style name="Theme.DeviceDefault.Dialog.NoActionBar">
         <item name="windowActionBar">false</item>
@@ -74,7 +78,6 @@
         <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
         <item name="buttonStyle">@style/Widget.DeviceDefault.Button</item>
         <item name="colorAccent">@color/accent_device_default_light</item>
-        <item name="colorBackground">@color/background_device_default_light</item>
         <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item>
         <item name="colorButtonNormal">@color/car_highlight</item>
         <item name="colorControlHighlight">@color/car_card_ripple_background</item>
@@ -118,4 +121,8 @@
 
     <style name="Theme.DeviceDefault.Settings"/>
     <style name="Theme.DeviceDefault.Settings.NoActionBar" parent="Theme.DeviceDefault.NoActionBar"/>
+
+    <style name="Theme.DeviceDefault.Light.DarkActionBar"  parent="Theme.DeviceDefault"/>
+      <!-- DeviceDefault theme for the default system theme.  -->
+    <style name="Theme.DeviceDefault.System" parent="Theme.DeviceDefault.Light.DarkActionBar" />
 </resources>