Merge "Update primary and secondary text colors to correctly distinguish between day vs night and light vs dark." into androidx-master-dev
diff --git a/car/core/api/res-1.0.0-alpha8.txt b/car/core/api/res-1.0.0-alpha8.txt
index 3212b19..f50f477 100644
--- a/car/core/api/res-1.0.0-alpha8.txt
+++ b/car/core/api/res-1.0.0-alpha8.txt
@@ -17,41 +17,56 @@
style TextAppearance_Car_Body1
style TextAppearance_Car_Body1_Light
style TextAppearance_Car_Body1_Medium
+style TextAppearance_Car_Body1_Medium_Dark
style TextAppearance_Car_Body1_Medium_Light
style TextAppearance_Car_Body2
+style TextAppearance_Car_Body2_Dark
style TextAppearance_Car_Body2_Light
style TextAppearance_Car_Body3
+style TextAppearance_Car_Body3_Dark
style TextAppearance_Car_Body3_Light
style TextAppearance_Car_Body3_Medium
+style TextAppearance_Car_Body3_Medium_Dark
style TextAppearance_Car_Body3_Medium_Light
style TextAppearance_Car_Body4
+style TextAppearance_Car_Body4_Dark
style TextAppearance_Car_Body4_Light
style TextAppearance_Car_Body4_Medium
+style TextAppearance_Car_Body4_Medium_Dark
style TextAppearance_Car_Body4_Medium_Light
style TextAppearance_Car_Display1
+style TextAppearance_Car_Display1_Dark
style TextAppearance_Car_Display1_Light
style TextAppearance_Car_Display2
+style TextAppearance_Car_Display2_Dark
style TextAppearance_Car_Display2_Light
style TextAppearance_Car_Display3
+style TextAppearance_Car_Display3_Dark
style TextAppearance_Car_Display3_Light
style TextAppearance_Car_Error
style TextAppearance_Car_Hint
style TextAppearance_Car_Hint_Light
style TextAppearance_Car_HintActionBar_Menu
style TextAppearance_Car_SubText1
+style TextAppearance_Car_SubText1_Dark
style TextAppearance_Car_SubText1_Light
style TextAppearance_Car_SubText1_Medium
style TextAppearance_Car_SubText1_Medium_Accent
+style TextAppearance_Car_SubText1_Medium_Dark
style TextAppearance_Car_SubText1_Medium_Light
style TextAppearance_Car_SubText2
+style TextAppearance_Car_SubText2_Dark
style TextAppearance_Car_SubText2_Light
style TextAppearance_Car_SubText2_Medium
style TextAppearance_Car_SubText2_Medium_Accent
+style TextAppearance_Car_SubText2_Medium_Dark
style TextAppearance_Car_SubText2_Medium_Light
style TextAppearance_Car_SubText3
+style TextAppearance_Car_SubText3_Dark
style TextAppearance_Car_SubText3_Light
style TextAppearance_Car_SubText3_Medium
style TextAppearance_Car_SubText3_Medium_Accent
+style TextAppearance_Car_SubText3_Medium_Dark
style TextAppearance_Car_SubText3_Medium_Light
style TextAppearance_Car_SubText4
style TextAppearance_Car_Subheader
@@ -151,12 +166,6 @@
dimen car_button_height
dimen car_button_min_width
dimen car_button_radius
-color car_car_primary_text
-color car_car_primary_text_dark
-color car_car_primary_text_light
-color car_car_secondary_text
-color car_car_secondary_text_dark
-color car_car_secondary_text_light
color car_card
color car_card_action_bar
color car_card_action_bar_dark
@@ -208,6 +217,9 @@
dimen car_padding_6
dimen car_pill_button_size
dimen car_primary_icon_size
+color car_primary_text
+color car_primary_text_dark
+color car_primary_text_light
dimen car_radius_1
dimen car_radius_2
dimen car_radius_3
@@ -216,6 +228,9 @@
color car_scrollbar_thumb_dark
color car_scrollbar_thumb_light
dimen car_secondary_icon_size
+color car_secondary_text
+color car_secondary_text_dark
+color car_secondary_text_light
color car_seekbar_track_background
color car_seekbar_track_background_dark
color car_seekbar_track_background_light
diff --git a/car/core/res-public/values/public_colors.xml b/car/core/res-public/values/public_colors.xml
index 84b5c4c..e0b4c71 100644
--- a/car/core/res-public/values/public_colors.xml
+++ b/car/core/res-public/values/public_colors.xml
@@ -18,12 +18,12 @@
<!-- Definitions of colors to be exposed as public. -->
<resources>
<!-- Car text colors -->
- <public type="color" name="car_car_primary_text" />
- <public type="color" name="car_car_primary_text_dark" />
- <public type="color" name="car_car_primary_text_light" />
- <public type="color" name="car_car_secondary_text" />
- <public type="color" name="car_car_secondary_text_dark" />
- <public type="color" name="car_car_secondary_text_light" />
+ <public type="color" name="car_primary_text" />
+ <public type="color" name="car_primary_text_dark" />
+ <public type="color" name="car_primary_text_light" />
+ <public type="color" name="car_secondary_text" />
+ <public type="color" name="car_secondary_text_dark" />
+ <public type="color" name="car_secondary_text_light" />
<!-- Deprecated. Mapping to primary and secondary text colors until removal. -->
<public type="color" name="car_display3_light" />
diff --git a/car/core/res-public/values/public_styles.xml b/car/core/res-public/values/public_styles.xml
index fc85a8c..bac8212 100644
--- a/car/core/res-public/values/public_styles.xml
+++ b/car/core/res-public/values/public_styles.xml
@@ -21,38 +21,53 @@
<public type="style" name="TextAppearance.Car" />
<public type="style" name="TextAppearance.Car.Display1" />
<public type="style" name="TextAppearance.Car.Display1.Light" />
+ <public type="style" name="TextAppearance.Car.Display1.Dark" />
<public type="style" name="TextAppearance.Car.Display2" />
<public type="style" name="TextAppearance.Car.Display2.Light" />
+ <public type="style" name="TextAppearance.Car.Display2.Dark" />
<public type="style" name="TextAppearance.Car.Display3" />
<public type="style" name="TextAppearance.Car.Display3.Light" />
+ <public type="style" name="TextAppearance.Car.Display3.Dark" />
<public type="style" name="TextAppearance.Car.Body1" />
<public type="style" name="TextAppearance.Car.Body1.Medium" />
<public type="style" name="TextAppearance.Car.Body1.Light" />
<public type="style" name="TextAppearance.Car.Body1.Medium.Light" />
+ <public type="style" name="TextAppearance.Car.Body1.Medium.Dark" />
<public type="style" name="TextAppearance.Car.Body2" />
<public type="style" name="TextAppearance.Car.Body2.Light" />
+ <public type="style" name="TextAppearance.Car.Body2.Dark" />
<public type="style" name="TextAppearance.Car.Body3" />
<public type="style" name="TextAppearance.Car.Body3.Medium" />
<public type="style" name="TextAppearance.Car.Body3.Light" />
<public type="style" name="TextAppearance.Car.Body3.Medium.Light" />
+ <public type="style" name="TextAppearance.Car.Body3.Dark" />
+ <public type="style" name="TextAppearance.Car.Body3.Medium.Dark" />
<public type="style" name="TextAppearance.Car.Body4" />
<public type="style" name="TextAppearance.Car.Body4.Medium" />
<public type="style" name="TextAppearance.Car.Body4.Light" />
<public type="style" name="TextAppearance.Car.Body4.Medium.Light" />
+ <public type="style" name="TextAppearance.Car.Body4.Dark" />
+ <public type="style" name="TextAppearance.Car.Body4.Medium.Dark" />
<public type="style" name="TextAppearance.Car.SubText1" />
<public type="style" name="TextAppearance.Car.SubText1.Medium" />
<public type="style" name="TextAppearance.Car.SubText1.Light" />
<public type="style" name="TextAppearance.Car.SubText1.Medium.Light" />
+ <public type="style" name="TextAppearance.Car.SubText1.Dark" />
+ <public type="style" name="TextAppearance.Car.SubText1.Medium.Dark" />
<public type="style" name="TextAppearance.Car.SubText1.Medium.Accent" />
<public type="style" name="TextAppearance.Car.SubText2" />
<public type="style" name="TextAppearance.Car.SubText2.Medium" />
<public type="style" name="TextAppearance.Car.SubText2.Light" />
<public type="style" name="TextAppearance.Car.SubText2.Medium.Light" />
+ <public type="style" name="TextAppearance.Car.SubText2.Dark" />
+ <public type="style" name="TextAppearance.Car.SubText2.Medium.Dark" />
<public type="style" name="TextAppearance.Car.SubText2.Medium.Accent" />
<public type="style" name="TextAppearance.Car.SubText3" />
<public type="style" name="TextAppearance.Car.SubText3.Medium" />
<public type="style" name="TextAppearance.Car.SubText3.Light" />
<public type="style" name="TextAppearance.Car.SubText3.Medium.Light" />
+ <public type="style" name="TextAppearance.Car.SubText3.Dark" />
+ <public type="style" name="TextAppearance.Car.SubText3.Medium.Dark" />
<public type="style" name="TextAppearance.Car.SubText3.Medium.Accent" />
<public type="style" name="TextAppearance.Car.SubText4" />
<public type="style" name="TextAppearance.Car.Subheader" />
diff --git a/car/core/res/values-night/colors.xml b/car/core/res/values-night/colors.xml
index ceae897..8b817ff 100644
--- a/car/core/res/values-night/colors.xml
+++ b/car/core/res/values-night/colors.xml
@@ -15,13 +15,6 @@
~ limitations under the License.
-->
<resources>
- <color name="car_primary_text">@color/car_primary_text_dark</color>
- <color name="car_secondary_text">@color/car_secondary_text_dark</color>
-
- <!-- Deprecated. Mapping to primary and secondary text colors until removal. -->
- <color name="car_body1">@color/car_primary_text_dark</color>
- <color name="car_body2">@color/car_primary_text_dark</color>
-
<color name="car_tint">@color/car_tint_light</color>
<color name="car_card_dark">@color/car_grey_958</color>
diff --git a/car/core/res/values/colors.xml b/car/core/res/values/colors.xml
index 65d6cb5..2efcad2 100644
--- a/car/core/res/values/colors.xml
+++ b/car/core/res/values/colors.xml
@@ -64,21 +64,21 @@
<color name="car_indigo_800">#ff283593</color>
<!-- Various colors for text. "Light" and "dark" here refer to the lighter or darker
- shades. -->
+ shades. The default for primary and secondary text color is the lighter shade.-->
<color name="car_primary_text">@color/car_primary_text_light</color>
<color name="car_secondary_text">@color/car_secondary_text_light</color>
<!-- Deprecated. Mapping to primary and secondary text colors until removal. -->
<color name="car_display3_light">@color/car_primary_text_light</color>
- <color name="car_body1">@color/car_primary_text_light</color>
+ <color name="car_body1">@color/car_primary_text</color>
<color name="car_body1_dark">@color/car_primary_text_dark</color>
- <color name="car_body1_light">@color/car_primary_text_dark</color>
- <color name="car_body2">@color/car_primary_text_light</color>
- <color name="car_body2_light">@color/car_primary_text_dark</color>
+ <color name="car_body1_light">@color/car_primary_text_light</color>
+ <color name="car_body2">@color/car_primary_text</color>
+ <color name="car_body2_light">@color/car_primary_text_light</color>
<color name="car_body3_light">@color/car_secondary_text_light</color>
<color name="car_body3_dark">@color/car_secondary_text_dark</color>
- <color name="car_body4_light">@color/car_secondary_text_dark</color>
- <color name="car_subtext1_light">@color/car_secondary_text_dark</color>
+ <color name="car_body4_light">@color/car_secondary_text_light</color>
+ <color name="car_subtext1_light">@color/car_secondary_text_light</color>
<!-- The tinting color for an icon. This icon is assumed to be on a light background. -->
<color name="car_tint">@color/car_tint_dark</color>
diff --git a/car/core/res/values/styles.xml b/car/core/res/values/styles.xml
index ea9f5de..53efee0 100644
--- a/car/core/res/values/styles.xml
+++ b/car/core/res/values/styles.xml
@@ -32,6 +32,10 @@
<item name="android:textColor">@color/car_primary_text_light</item>
</style>
+ <style name="TextAppearance.Car.Display1.Dark">
+ <item name="android:textColor">@color/car_primary_text_dark</item>
+ </style>
+
<style name="TextAppearance.Car.Display2">
<item name="android:textStyle">normal</item>
<item name="android:textSize">@dimen/car_display2_size</item>
@@ -42,6 +46,10 @@
<item name="android:textColor">@color/car_primary_text_light</item>
</style>
+ <style name="TextAppearance.Car.Display2.Dark">
+ <item name="android:textColor">@color/car_primary_text_dark</item>
+ </style>
+
<style name="TextAppearance.Car.Display3">
<item name="android:textStyle">normal</item>
<item name="android:textSize">@dimen/car_display3_size</item>
@@ -52,6 +60,10 @@
<item name="android:textColor">@color/car_primary_text_light</item>
</style>
+ <style name="TextAppearance.Car.Display3.Dark">
+ <item name="android:textColor">@color/car_primary_text_dark</item>
+ </style>
+
<!-- The styling for body text. The color of this text changes based on the day/night mode. -->
<style name="TextAppearance.Car.Body1">
<item name="android:textStyle">normal</item>
@@ -72,6 +84,15 @@
<item name="android:textColor">@color/car_primary_text_light</item>
</style>
+ <!-- Body1 text that is permanently a dark color. -->
+ <style name="TextAppearance.Car.Body1.Dark">
+ <item name="android:textColor">@color/car_primary_text_dark</item>
+ </style>
+
+ <style name="TextAppearance.Car.Body1.Medium.Dark">
+ <item name="android:textColor">@color/car_primary_text_dark</item>
+ </style>
+
<!-- An alternate styling for body text that is a different size than CarBody1. -->
<style name="TextAppearance.Car.Body2">
<item name="android:textStyle">normal</item>
@@ -84,6 +105,11 @@
<item name="android:textColor">@color/car_primary_text_light</item>
</style>
+ <!-- Body2 text that is permanently a light color. -->
+ <style name="TextAppearance.Car.Body2.Dark">
+ <item name="android:textColor">@color/car_primary_text_dark</item>
+ </style>
+
<!-- A smaller styling for body text. The color of this text changes based on the day/night
mode. -->
<style name="TextAppearance.Car.Body3">
@@ -104,6 +130,14 @@
<item name="android:textColor">@color/car_secondary_text_light</item>
</style>
+ <style name="TextAppearance.Car.Body3.Dark">
+ <item name="android:textColor">@color/car_secondary_text_dark</item>
+ </style>
+
+ <style name="TextAppearance.Car.Body3.Medium.Dark">
+ <item name="android:textColor">@color/car_secondary_text_dark</item>
+ </style>
+
<style name="TextAppearance.Car.Body3.Medium.Accent">
<item name="android:textColor">@color/car_accent</item>
</style>
@@ -144,6 +178,14 @@
<item name="android:textColor">@color/car_secondary_text_light</item>
</style>
+ <style name="TextAppearance.Car.SubText1.Dark">
+ <item name="android:textColor">@color/car_secondary_text_dark</item>
+ </style>
+
+ <style name="TextAppearance.Car.SubText1.Medium.Dark">
+ <item name="android:textColor">@color/car_secondary_text_dark</item>
+ </style>
+
<style name="TextAppearance.Car.SubText1.Medium.Accent">
<item name="android:textColor">@color/car_accent</item>
</style>
@@ -166,6 +208,14 @@
<item name="android:textColor">@color/car_secondary_text_light</item>
</style>
+ <style name="TextAppearance.Car.SubText2.Dark">
+ <item name="android:textColor">@color/car_secondary_text_dark</item>
+ </style>
+
+ <style name="TextAppearance.Car.SubText2.Medium.Dark">
+ <item name="android:textColor">@color/car_secondary_text_dark</item>
+ </style>
+
<style name="TextAppearance.Car.SubText2.Medium.Accent">
<item name="android:textColor">@color/car_accent</item>
</style>
@@ -188,6 +238,15 @@
<item name="android:textColor">@color/car_secondary_text_light</item>
</style>
+ <style name="TextAppearance.Car.SubText3.Dark">
+ <item name="android:textColor">@color/car_secondary_text_dark</item>
+ </style>
+
+ <style name="TextAppearance.Car.SubText3.Medium.Dark">
+ <item name="android:textColor">@color/car_secondary_text_dark</item>
+ </style>
+
+
<style name="TextAppearance.Car.SubText3.Medium.Accent">
<item name="android:textColor">@color/car_accent</item>
</style>
@@ -213,6 +272,9 @@
<!-- A style for TextInputLayout hints that is fixed to a light color. -->
<style name="TextAppearance.Car.Hint.Light" parent="TextAppearance.Car.Body2.Light" />
+ <!-- A style for TextInputLayout hints that is fixed to a dark color. -->
+ <style name="TextAppearance.Car.Hint.Dark" parent="TextAppearance.Car.Body2.Dark" />
+
<!-- Styles for an error message for TextInputLayouts. -->
<style name="TextAppearance.Car.Error" parent="TextAppearance.Car.Body2">
<item name="android:textColor">@color/car_red_400</item>
@@ -227,6 +289,10 @@
<item name="android:textColor">@color/car_secondary_text_light</item>
</style>
+ <style name="TextAppearance.Car.ListItem.BodyText.Dark">
+ <item name="android:textColor">@color/car_secondary_text_dark</item>
+ </style>
+
<!-- Style for the Alpha Jump button in the Scrollbar View -->
<style name="TextAppearance.Car.AlphaJumpButton">
<item name="android:textStyle">bold</item>
@@ -380,7 +446,7 @@
<item name="android:singleLine">true</item>
<item name="android:textAllCaps">false</item>
<item name="android:background">@drawable/car_button_background</item>
- <item name="android:textColor">@android:color/black</item>
+ <item name="android:textColor">@color/car_primary_text_dark</item>
</style>
<!-- A style for buttons that has white text. -->
diff --git a/car/core/res/values/themes.xml b/car/core/res/values/themes.xml
index f2611bb..0c088e4 100644
--- a/car/core/res/values/themes.xml
+++ b/car/core/res/values/themes.xml
@@ -300,7 +300,7 @@
<item name="android:colorControlActivated">@color/car_accent_dark</item>
<item name="listItemForeground">@drawable/car_card_ripple_background</item>
<item name="android:background">@color/car_card_light</item>
- <item name="android:textColorPrimary">@android:color/black</item>
+ <item name="android:textColorPrimary">@color/car_primary_text_dark</item>
<item name="android:windowTitleStyle">@style/Widget.Car.Dialog.Title</item>
</style>
diff --git a/car/core/src/main/res/color-night/car_primary_text_light.xml b/car/core/src/main/res/color-night/car_primary_text_light.xml
new file mode 100644
index 0000000..9b5d499
--- /dev/null
+++ b/car/core/src/main/res/color-night/car_primary_text_light.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- Default text colors for car buttons when enabled/disabled. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_enabled="false"
+ android:alpha="0.44"
+ android:color="@android:color/white" />
+ <item android:color="@android:color/white"
+ android:alpha="0.88" />
+</selector>
\ No newline at end of file
diff --git a/car/core/src/main/res/color-night/car_secondary_text_light.xml b/car/core/src/main/res/color-night/car_secondary_text_light.xml
new file mode 100644
index 0000000..ee6e15c
--- /dev/null
+++ b/car/core/src/main/res/color-night/car_secondary_text_light.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- Default text colors for car buttons when enabled/disabled. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_enabled="false"
+ android:alpha="0.30"
+ android:color="@android:color/white"/>
+ <item android:color="@android:color/white"
+ android:alpha="0.60" />
+</selector>
\ No newline at end of file
diff --git a/car/core/src/main/res/color/car_primary_text_dark.xml b/car/core/src/main/res/color/car_primary_text_dark.xml
index 9b5d499..2b24eaf 100644
--- a/car/core/src/main/res/color/car_primary_text_dark.xml
+++ b/car/core/src/main/res/color/car_primary_text_dark.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (C) 2018 The Android Open Source Project
+ Copyright (C) 2019 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@
<!-- Default text colors for car buttons when enabled/disabled. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
- android:alpha="0.44"
- android:color="@android:color/white" />
- <item android:color="@android:color/white"
- android:alpha="0.88" />
+ android:alpha="0.40"
+ android:color="@android:color/white" />
+ <item android:color="@android:color/black" />
</selector>
\ No newline at end of file
diff --git a/car/core/src/main/res/color/car_secondary_text_dark.xml b/car/core/src/main/res/color/car_secondary_text_dark.xml
index ee6e15c..2b24eaf 100644
--- a/car/core/src/main/res/color/car_secondary_text_dark.xml
+++ b/car/core/src/main/res/color/car_secondary_text_dark.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (C) 2018 The Android Open Source Project
+ Copyright (C) 2019 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@
<!-- Default text colors for car buttons when enabled/disabled. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
- android:alpha="0.30"
- android:color="@android:color/white"/>
- <item android:color="@android:color/white"
- android:alpha="0.60" />
+ android:alpha="0.40"
+ android:color="@android:color/white" />
+ <item android:color="@android:color/black" />
</selector>
\ No newline at end of file
