Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48cfb7d0 authored by Brad Stenning's avatar Brad Stenning Committed by Android (Google) Code Review
Browse files

Merge changes from topics "dialog_fix", "default_car_theme" 

* changes:
  Fix up the device colors that were missed
  Push color and default attributes up to the platform level
parents ab4bbc03 5db5bfef

core/res/res/values/colors_car.xml

+267 −11
Original line number Diff line number Diff line
@@ -17,15 +17,271 @@ 
 */

-->

<resources>

  <!-- car support colors from

  https://cs.corp.google.com/android/frameworks/support/car/res/values/colors.xml -->

    <color name="car_background">@color/black</color>



    <color name="car_colorPrimary">@color/car_grey_868</color>

    <color name="car_colorSecondary">@color/car_grey_900</color>

    <color name="car_colorPrimaryDark">@color/car_grey_958</color>





    <!-- Various colors for text sizes. "Light" and "dark" here refer to the lighter or darker

          shades. -->

    <color name="car_title_light">@color/car_grey_100</color>

    <color name="car_title_dark">@color/car_grey_900</color>

    <color name="car_title">@color/car_title_light</color>



    <color name="car_title2_light">@color/car_grey_100</color>

    <color name="car_title2_dark">@color/car_grey_900</color>

    <color name="car_title2">@color/car_title2_light</color>



    <color name="car_headline1_light">@color/car_grey_100</color>

    <color name="car_headline1_dark">@color/car_grey_800</color>

    <color name="car_headline1">@color/car_headline1_light</color>



    <color name="car_headline2_light">@color/car_grey_100</color>

    <color name="car_headline2_dark">@color/car_grey_900</color>

    <color name="car_headline2">@color/car_headline2_light</color>



    <color name="car_headline3_light">@android:color/white</color>

    <color name="car_headline3_dark">@color/car_grey_900</color>

    <color name="car_headline3">@color/car_headline3_light</color>



    <color name="car_headline4_light">@android:color/white</color>

    <color name="car_headline4_dark">@android:color/black</color>

    <color name="car_headline4">@color/car_headline4_light</color>



    <color name="car_body1_light">@color/car_grey_100</color>

    <color name="car_body1_dark">@color/car_grey_900</color>

    <color name="car_body1">@color/car_body1_light</color>



    <color name="car_body2_light">@color/car_grey_300</color>

    <color name="car_body2_dark">@color/car_grey_700</color>

    <color name="car_body2">@color/car_body2_light</color>



    <color name="car_body3_light">@android:color/white</color>

    <color name="car_body3_dark">@android:color/black</color>

    <color name="car_body3">@color/car_body3_light</color>



    <color name="car_body4_light">@android:color/white</color>

    <color name="car_body4_dark">@android:color/black</color>

    <color name="car_body4">@color/car_body4_light</color>



    <color name="car_action1_light">@color/car_grey_900</color>

    <color name="car_action1_dark">@color/car_grey_50</color>

    <color name="car_action1">@color/car_action1_light</color>



    <!-- The tinting colors to create a light- and dark-colored icon respectively. -->

    <color name="car_tint_light">@color/car_grey_50</color>

    <color name="car_tint_dark">@color/car_grey_900</color>



    <!-- The tinting color for an icon. This icon is assumed to be on a light background. -->

    <color name="car_tint">@color/car_tint_light</color>



    <!-- An inverted tinting from car_tint. -->

    <color name="car_tint_inverse">@color/car_tint_dark</color>



    <!-- The color of the divider. The color here is a lighter shade. -->

    <color name="car_list_divider_light">#1fffffff</color>



    <!-- The color of the divider. The color here is a darker shade. -->

    <color name="car_list_divider_dark">#1f000000</color>



    <!-- The color of the dividers in the list. This color is assumed to be on a light colored

         view. -->

    <color name="car_list_divider">@color/car_list_divider_light</color>



    <!-- A light and dark colored card. -->

    <color name="car_card_light">@color/car_grey_50</color>

    <color name="car_card_dark">@color/car_dark_blue_grey_700</color>



    <!-- The default color of a card in car UI. -->

    <color name="car_card">@color/car_card_dark</color>



    <!-- The ripple colors. The "dark" and "light" designation here refers to the color of the

         ripple  itself. -->

    <color name="car_card_ripple_background_dark">#8F000000</color>

    <color name="car_card_ripple_background_light">#27ffffff</color>



    <!-- The ripple color for a light colored card. -->

    <color name="car_card_ripple_background">@color/car_card_ripple_background_light</color>



    <!-- The ripple color for a dark-colored card. This color is the opposite of

         car_card_ripple_background. -->

    <color name="car_card_ripple_background_inverse">@color/car_card_ripple_background_dark</color>



    <!-- The top margin before the start of content in an application. -->

    <dimen name="app_header_height">96dp</dimen>



    <!-- The lighter and darker color for the scrollbar thumb. -->

    <color name="car_scrollbar_thumb_light">#99ffffff</color>

    <color name="car_scrollbar_thumb_dark">#7f0b0f12</color>



    <!-- The color of the scroll bar indicator in the PagedListView. This color is assumed to be on

         a light-colored background. -->

    <color name="car_scrollbar_thumb">@color/car_scrollbar_thumb_light</color>



    <!-- The inverted color of the scroll bar indicator. This color is always the opposite of

         car_scrollbar_thumb. -->

    <color name="car_scrollbar_thumb_inverse">@color/car_scrollbar_thumb_dark</color>



    <!-- The color of the seekbar track secondary progress in SeekbarListItem. -->

    <color name="car_seekbar_track_secondary_progress">@color/car_grey_500</color>



    <!-- The lighter and darker color for the seekbar track background. -->

    <color name="car_seekbar_track_background_light">@color/car_grey_400</color>

    <color name="car_seekbar_track_background_dark">@color/car_grey_700</color>

    <!-- The color of the seekbar track background in SeekbarListItem. This color is assumed to be

         on a light-colored background. -->

    <color name="car_seekbar_track_background">@color/car_seekbar_track_background_dark</color>

    <!-- background is car_grey_868 with .9 alpha -->

    <color name="car_toast_background">#E6282a2d</color>



    <!-- Misc colors -->

    <color name="car_highlight_light">@color/car_teal_700</color>

    <color name="car_highlight_dark">@color/car_teal_200</color>

    <color name="car_highlight">@color/car_highlight_dark</color>

    <color name="car_accent_light">@color/car_highlight_light</color>

    <color name="car_accent_dark">@color/car_highlight_dark</color>

    <color name="car_accent">@color/car_highlight_dark</color>



    <color name="car_user_switcher_user_image_bgcolor">@color/car_grey_50</color>

    <color name="car_user_switcher_user_image_fgcolor">@color/car_grey_900</color>

  <color name="car_card_dark">@color/car_dark_blue_grey_700</color>

  <color name="car_body1_light">@color/car_grey_100</color>



  <color name="car_grey_50">#fffafafa</color>

  <color name="car_grey_900">#ff212121</color>

    <!-- Color palette for cars -->

    <color name="car_grey_958">#ff0e1013</color>

    <color name="car_grey_928">#ff17181b</color>

    <color name="car_grey_900">#ff202124</color>

    <color name="car_grey_868">#ff282a2d</color>

    <color name="car_grey_846">#ff2e3234</color>

    <color name="car_grey_800">#ff3c4043</color>

    <color name="car_grey_772">#ff464a4d</color>

    <color name="car_grey_746">#ff4d5256</color>

    <color name="car_grey_700">#ff5f6368</color>

    <color name="car_grey_600">#ff80868b</color>

    <color name="car_grey_500">#ff9aa0a6</color>

    <color name="car_grey_400">#ffbdc1c6</color>

    <color name="car_grey_300">#ffdadce0</color>

    <color name="car_grey_200">#ffe8eaed</color>

    <color name="car_grey_100">#fff1f3f4</color>

    <color name="car_grey_50">#fff8f9fa</color>



    <color name="car_blue_900">#ff1d57a9</color>

    <color name="car_blue_800">#ff2065bb</color>

    <color name="car_blue_700">#ff2374ce</color>

    <color name="car_blue_600">#ff2581df</color>

    <color name="car_blue_500">#ff5195ea</color>

    <color name="car_blue_400">#ff6ba5ed</color>

    <color name="car_blue_300">#ff96bff2</color>

    <color name="car_blue_200">#ffb9d4f6</color>

    <color name="car_blue_100">#ffd9e6f9</color>

    <color name="car_blue_50">#ffebf1fc</color>



    <color name="car_green_900">#ff136e39</color>

    <color name="car_green_800">#ff1b7e42</color>

    <color name="car_green_700">#ff218c48</color>

    <color name="car_green_600">#ff28994f</color>

    <color name="car_green_500">#ff41af6a</color>

    <color name="car_green_400">#ff5dba80</color>

    <color name="car_green_300">#ff8dcfa5</color>

    <color name="car_green_200">#ffb3dfc3</color>

    <color name="car_green_100">#ffd5ebdf</color>

    <color name="car_green_50">#ffe8f3ee</color>



    <color name="car_red_900">#ffa81314</color>

    <color name="car_red_800">#ffb41b1a</color>

    <color name="car_red_700">#ffc22a2a</color>

    <color name="car_red_600">#ffd33b30</color>

    <color name="car_red_500">#ffe25142</color>

    <color name="car_red_400">#ffe66a5e</color>

    <color name="car_red_300">#ffed968d</color>

    <color name="car_red_200">#fff3b9b3</color>

    <color name="car_red_100">#fff7d8d9</color>

    <color name="car_red_50">#fffaebeb</color>



    <color name="car_yellow_900">#ffdd860e</color>

    <color name="car_yellow_800">#ffe59810</color>

    <color name="car_yellow_700">#ffeda912</color>

    <color name="car_yellow_600">#fff3b713</color>

    <color name="car_yellow_500">#fff5c518</color>

    <color name="car_yellow_400">#fff6cd3a</color>

    <color name="car_yellow_300">#fff9dc74</color>

    <color name="car_yellow_200">#fffbe7a2</color>

    <color name="car_yellow_100">#fffcf0ce</color>

    <color name="car_yellow_50">#fffdf7e6</color>



    <color name="car_orange_900">#ffb06000</color>

    <color name="car_orange_800">#ffc26401</color>

    <color name="car_orange_700">#ffd56e0c</color>

    <color name="car_orange_600">#ffe8710a</color>

    <color name="car_orange_500">#fffa7b17</color>

    <color name="car_orange_400">#fffa903e</color>

    <color name="car_orange_300">#fffcad70</color>

    <color name="car_orange_200">#fffdc69c</color>

    <color name="car_orange_100">#fffedfc8</color>

    <color name="car_orange_50">#fffeefe3</color>



    <color name="car_pink_900">#ff9c166b</color>

    <color name="car_pink_800">#ffb80672</color>

    <color name="car_pink_700">#ffd01884</color>

    <color name="car_pink_600">#ffe52592</color>

    <color name="car_pink_500">#fff439a0</color>

    <color name="car_pink_400">#ffff63b8</color>

    <color name="car_pink_300">#ffff8bcb</color>

    <color name="car_pink_200">#fffba9d6</color>

    <color name="car_pink_100">#fffdcfe8</color>

    <color name="car_pink_50">#fffde7f3</color>



    <color name="car_teal_900">#ff004d40</color>

    <color name="car_teal_800">#ff00695c</color>

    <color name="car_teal_700">#ff00796b</color>

    <color name="car_teal_600">#ff00897b</color>

    <color name="car_teal_500">#ff009688</color>

    <color name="car_teal_400">#ff26a69a</color>

    <color name="car_teal_300">#ff4db6ac</color>

    <color name="car_teal_200">#ff80cbc4</color>

    <color name="car_teal_100">#ffb2dfdb</color>

    <color name="car_teal_50">#ffe0f2f1</color>



    <color name="car_purple_900">#ff681da8</color>

    <color name="car_purple_800">#ff7627bb</color>

    <color name="car_purple_700">#ff8430ce</color>

    <color name="car_purple_600">#ff9334e6</color>

    <color name="car_purple_500">#ffa142f4</color>

    <color name="car_purple_400">#ffaf5cf7</color>

    <color name="car_purple_300">#ffc58af9</color>

    <color name="car_purple_200">#ffd7aefb</color>

    <color name="car_purple_100">#ffe9d2fd</color>

    <color name="car_purple_50">#fff3e8fd</color>



    <color name="car_cyan_900">#ff01877e</color>

    <color name="car_cyan_800">#ff099091</color>

    <color name="car_cyan_700">#ff12a4af</color>

    <color name="car_cyan_600">#ff12b5cb</color>

    <color name="car_cyan_500">#ff24c1e0</color>

    <color name="car_cyan_400">#ff4ecde6</color>

    <color name="car_cyan_300">#ff78d9ec</color>

    <color name="car_cyan_200">#ffa1e4f2</color>

    <color name="car_cyan_100">#ffcbf0f8</color>

    <color name="car_cyan_50">#ffe4f7fb</color>





    <color name="car_grey_1000">#cc000000</color>

    <color name="car_white_1000">#1effffff</color>

    <color name="car_blue_grey_800">#ff37474F</color>

    <color name="car_blue_grey_900">#ff263238</color>

    <color name="car_dark_blue_grey_600">#ff1d272d</color>

    <color name="car_dark_blue_grey_700">#ff172026</color>

  <color name="car_grey_100">#fff5f5f5</color>

    <color name="car_dark_blue_grey_800">#ff11181d</color>

    <color name="car_dark_blue_grey_900">#ff0c1013</color>

    <color name="car_dark_blue_grey_1000">#ff090c0f</color>

    <color name="car_light_blue_300">#ff4fc3f7</color>

    <color name="car_light_blue_500">#ff03A9F4</color>

    <color name="car_light_blue_600">#ff039be5</color>

    <color name="car_light_blue_700">#ff0288d1</color>

    <color name="car_light_blue_800">#ff0277bd</color>

    <color name="car_light_blue_900">#ff01579b</color>





    <color name="car_red_500a">#ffd50000</color>

    <color name="car_red_a700">#ffd50000</color>

</resources>

core/res/res/values/dimens_car.xml

+77 −3
Original line number Diff line number Diff line
@@ -16,12 +16,86 @@ 
*/

-->

<resources>

    <!-- TODO replace with car support lib sizes when available -->

    <dimen name="car_fullscreen_user_pod_icon_text_size">64sp</dimen>

    <dimen name="car_fullscreen_user_pod_width">243dp</dimen>

    <dimen name="car_fullscreen_user_pod_height">356dp</dimen>

    <dimen name="car_fullscreen_user_pod_image_avatar_width">96dp</dimen>

    <dimen name="car_fullscreen_user_pod_image_avatar_height">96dp</dimen>

    <dimen name="car_padding_4">20dp</dimen>





    <!-- Application Bar -->

    <dimen name="car_app_bar_height">80dp</dimen>

    <!-- Margin -->

    <dimen name="car_margin">20dp</dimen>

    <!-- Lists -->

    <dimen name="car_single_line_list_item_height">96dp</dimen>

    <dimen name="car_double_line_list_item_height">@dimen/car_single_line_list_item_height</dimen>

    <dimen name="car_list_divider_height">1dp</dimen>

    <!-- The diff between keyline 1 and keyline 3. -->

    <dimen name="car_keyline_1_keyline_3_diff">88dp</dimen>

    <dimen name="car_dialog_action_bar_height">@dimen/car_card_action_bar_height</dimen>

    <dimen name="car_primary_icon_size">44dp</dimen>



    <!-- Text size for car -->

    <dimen name="car_title_size">32sp</dimen>

    <dimen name="car_title2_size">32sp</dimen>

    <dimen name="car_headline1_size">45sp</dimen>

    <dimen name="car_headline2_size">32sp</dimen>

    <dimen name="car_headline3_size">24sp</dimen>

    <dimen name="car_headline4_size">20sp</dimen>

    <dimen name="car_body1_size">32sp</dimen>

    <dimen name="car_body2_size">26sp</dimen>

    <dimen name="car_body3_size">16sp</dimen>

    <dimen name="car_body4_size">14sp</dimen>

    <dimen name="car_body5_size">18sp</dimen>

    <dimen name="car_label1_size">26sp</dimen>

    <dimen name="car_label2_size">64sp</dimen>

    <dimen name="car_action1_size">26sp</dimen>

    <dimen name="car_action2_size">26sp</dimen>



    <!-- Common icon size for car app -->

    <dimen name="car_icon_size">56dp</dimen>



    <dimen name="car_card_header_height">96dp</dimen>

    <dimen name="car_card_action_bar_height">96dp</dimen>



    <!-- Paddings -->

    <dimen name="car_padding_1">4dp</dimen>

    <dimen name="car_padding_2">10dp</dimen>

    <dimen name="car_padding_3">16dp</dimen>

    <dimen name="car_padding_4">28dp</dimen>

    <dimen name="car_padding_5">32dp</dimen>



    <!-- Radius -->

    <dimen name="car_radius_1">4dp</dimen>

    <dimen name="car_radius_2">8dp</dimen>

    <dimen name="car_radius_3">16dp</dimen>

    <dimen name="car_radius_5">100dp</dimen>



    <!-- Keylines for content. -->

    <dimen name="car_keyline_1">48dp</dimen>

    <dimen name="car_keyline_2">108dp</dimen>

    <dimen name="car_keyline_3">152dp</dimen>

    <dimen name="car_keyline_4">182dp</dimen>



    <!-- Buttons -->

    <dimen name="car_button_height">56dp</dimen>

    <dimen name="car_button_min_width">158dp</dimen>

    <dimen name="car_button_horizontal_padding">@dimen/car_padding_4</dimen>

    <dimen name="car_borderless_button_horizontal_padding">0dp</dimen>

    <dimen name="car_button_radius">@dimen/car_radius_1</dimen>

    <dimen name="car_pill_button_size">56dp</dimen>



    <!-- Seekbar -->

    <dimen name="car_seekbar_height">6dp</dimen>

    <dimen name="car_seekbar_padding">26dp</dimen>

    <dimen name="car_seekbar_thumb_size">24dp</dimen>

    <dimen name="car_seekbar_thumb_stroke">1dp</dimen>

    <!-- The space between seekbar and text in ListItem. This value is based on car_seekbar_padding.

         It brings seekbar and text closer for visual balance while maintaining touch area. -->

    <dimen name="car_seekbar_text_overlap">-20dp</dimen>



    <!-- Progress Bar -->

    <dimen name="car_progress_bar_height">@dimen/car_seekbar_height</dimen>



</resources>

core/res/res/values/styles_car.xml

0 → 100644
+89 −0
Original line number Diff line number Diff line 
<?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.

-->

<resources>

    <!-- Car text -->

    <style name="CarBody1">

        <item name="textStyle">normal</item>

        <item name="textSize">@dimen/car_body1_size</item>

        <item name="textColor">@color/car_body1</item>

    </style>



    <style name="CarBody1.Light">

        <item name="textColor">@color/car_body1_light</item>

    </style>



    <style name="CarBody1.Dark">

        <item name="textColor">@color/car_body2_dark</item>

    </style>



    <style name="CarBody2">

        <item name="textStyle">normal</item>

        <item name="textSize">@dimen/car_body2_size</item>

        <item name="textColor">@color/car_body2</item>

    </style>



    <style name="CarBody2.Dark">

        <item name="textColor">@color/car_body2_dark</item>

    </style>

    <style name="CarBody2.Light">

        <item name="textColor">@color/car_body2_light</item>

    </style>



    <style name="CarBody3">

        <item name="textStyle">normal</item>

        <item name="textSize">@dimen/car_body3_size</item>

        <item name="textColor">@color/car_body3</item>

    </style>



    <!-- The smallest styling for body text. The color of this text changes based on the day/night

         mode. -->

    <style name="CarBody4">

        <item name="textStyle">normal</item>

        <item name="textSize">@dimen/car_body4_size</item>

        <item name="textColor">@color/car_body4</item>

    </style>



    <style name="CarAction1">

        <item name="textStyle">bold</item>

        <item name="textSize">@dimen/car_action1_size</item>

        <item name="textColor">@color/car_highlight</item>

    </style>



    <style name="CarAction1.Dark">

        <item name="textColor">@color/car_highlight_dark</item>

    </style>

    <style name="CarAction1.Light">

        <item name="textColor">@color/car_highlight_light</item>

    </style>



    <!-- The styling for title text. The color of this text changes based on day/night mode. -->

    <style name="CarTitle" >

        <item name="textStyle">bold</item>

        <item name="textSize">@dimen/car_title2_size</item>

        <item name="textColor">@color/car_title</item>

    </style>



    <!-- Title text that is permanently a dark color. -->

    <style name="CarTitle.Dark" >

        <item name="textColor">@color/car_title_dark</item>

    </style>



    <!-- Title text that is permanently a light color. -->

    <style name="CarTitle.Light" >

        <item name="textColor">@color/car_title_light</item>

    </style>



</resources>

core/res/res/values/themes_device_defaults.xml

+6 −0
Original line number Diff line number Diff line
@@ -1716,4 +1716,10 @@ easier. 
        <item name="colorAccent">@color/accent_device_default_dark</item>

    </style>



    <style name="Theme.DeviceDefault.Light.Dialog.Alert.UserSwitchingDialog" parent="Theme.DeviceDefault.NoActionBar.Fullscreen">

        <item name="colorBackground">@color/background_device_default_light</item>

        <item name="colorBackgroundFloating">@color/background_device_default_light</item>

        <item name="layout_gravity">center</item>

    </style>



</resources>