From 8f000b7deafbe8771ba3219fdf68dd815489ebdf Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Tue, 29 May 2018 23:03:00 -0700
Subject: Some minor tweaks to the UI.

Bug: 79883035
Test: tap
PiperOrigin-RevId: 198510062
Change-Id: Ia07624a4511626b2b397199f3674817612557133
---
 .../impl/bottomnav/res/layout/bottom_nav_item.xml  |  1 +
 .../impl/toolbar/res/layout/toolbar_layout.xml     |  4 +--
 .../android/dialer/theme/base/res/values/attr.xml  | 12 +++++++-
 .../theme/base/res/values/styles_dialer_light.xml  |  1 -
 .../theme/base/res/values/theme_dialer_dark.xml    | 27 +++++++++--------
 .../theme/base/res/values/theme_dialer_light.xml   | 29 ++++++++++++------
 .../dialer/theme/common/res/values/colors.xml      |  1 +
 .../res/color/dialer_dark_primary_text_color.xml   |  4 +--
 .../res/color/dialer_dark_secondary_text_color.xml |  4 +--
 .../hidden/res/color/dialer_primary_text_color.xml |  4 +--
 .../res/color/dialer_secondary_text_color.xml      |  4 +--
 .../res/color/settings_text_color_primary.xml      |  4 +--
 .../res/color/settings_text_color_secondary.xml    |  4 +--
 .../theme/hidden/res/values/colors_dialer_dark.xml | 26 +++-------------
 .../hidden/res/values/colors_dialer_light.xml      | 31 +------------------
 .../theme/hidden/res/values/colors_pallet.xml      | 35 ++++++++++++++++++++++
 .../dialer/theme/hidden/res/values/styles.xml      |  2 ++
 .../impl/res/drawable/shape_chip_drawable.xml      |  4 +--
 .../android/incallui/theme/res/values/colors.xml   |  3 --
 .../android/incallui/theme/res/values/styles.xml   |  4 +--
 20 files changed, 107 insertions(+), 97 deletions(-)
 create mode 100644 java/com/android/dialer/theme/hidden/res/values/colors_pallet.xml

diff --git a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
index 3fbd9ffc9..02874a9d8 100644
--- a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
+++ b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
@@ -59,5 +59,6 @@
       android:layout_height="wrap_content"
       android:layout_marginBottom="8dp"
       android:gravity="center_horizontal"
+      android:textSize="12sp"
       style="@style/Dialer.TextAppearance.Secondary"/>
 </com.android.dialer.main.impl.bottomnav.BottomNavItem>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
index 578684ef8..049cf2ef5 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
@@ -61,8 +61,8 @@
             android:layout_toEndOf="@+id/search_magnifying_glass"
             android:layout_toStartOf="@+id/voice_search_button"
             android:text="@string/dialer_hint_find_contact"
-            android:textColor="?android:attr/textColorHint"
-            android:textSize="16dp"/>
+            android:textSize="16dp"
+            style="@style/Dialer.TextAppearance.Secondary"/>
 
         <ImageView
             android:id="@+id/voice_search_button"
diff --git a/java/com/android/dialer/theme/base/res/values/attr.xml b/java/com/android/dialer/theme/base/res/values/attr.xml
index 41c6225ad..606d161ad 100644
--- a/java/com/android/dialer/theme/base/res/values/attr.xml
+++ b/java/com/android/dialer/theme/base/res/values/attr.xml
@@ -23,4 +23,14 @@
   <attr name="colorTextOnUnthemedDarkBackground" format="color"/>
   <!-- Used to color icons on dark backgrounds. White in Light Theme. -->
   <attr name="colorIconOnUnthemedDarkBackground" format="color"/>
-</resources>
\ No newline at end of file
+  <!-- Used to color the background of chat bubbles we send -->
+  <attr name="colorMobileOriginatingChatBackground" format="color"/>
+  <!-- Used to color the text in chat bubbles we send -->
+  <attr name="colorMobileOriginatingChatText" format="color"/>
+  <!-- Used to color the background of chat bubbles we receive -->
+  <attr name="colorMobileTerminatingChatBackground" format="color"/>
+  <!-- Used to color the text in chat bubbles we receive -->
+  <attr name="colorMobileTerminatingChatText" format="color"/>
+  <!-- Used to theme ripple effects with the app's primary color. -->
+  <attr name="colorPrimary20pct" format="color|reference"/>
+</resources>
diff --git a/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml b/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml
index cfdee7801..5fecbaee5 100644
--- a/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml
+++ b/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml
@@ -34,7 +34,6 @@
     <item name="android:textColorSecondary">@color/settings_text_color_secondary</item>
     <item name="android:windowBackground">?android:attr/colorBackground</item>
     <item name="android:colorAccent">?android:attr/colorPrimary</item>
-    <item name="android:textColorLink">?android:attr/colorPrimary</item>
   </style>
 
   <!-- TODO(a bug): This is only actively used in empty_content_view.xml. Move it there. -->
diff --git a/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml b/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml
index e01a3a282..142bb897b 100644
--- a/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml
+++ b/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml
@@ -33,24 +33,24 @@
   <!-- Activities and Applications should inherit from one of the themes above. -->
   <style name="Dialer.Dark.ThemeBase">
     <!-- These values should be used to color all backgrounds. -->
-    <item name="android:colorBackground">@color/dialer_dark_background</item>
-    <item name="android:colorBackgroundFloating">@color/dialer_dark_background_floating</item>
+    <item name="android:colorBackground">@color/google_grey_900</item>
+    <item name="android:colorBackgroundFloating">@color/google_grey_800</item>
 
     <!-- These values should be used to set text color. -->
     <!-- swap text colors. -->
-    <item name="android:textColorPrimary">@color/dialer_primary_text_color_inverse</item>
-    <item name="android:textColorSecondary">@color/dialer_secondary_text_color_inverse</item>
+    <item name="android:textColorPrimary">@color/dialer_dark_primary_text_color</item>
+    <item name="android:textColorSecondary">@color/dialer_dark_secondary_text_color</item>
     <item name="android:textColorPrimaryInverse">@color/dialer_primary_text_color</item>
     <item name="android:textColorSecondaryInverse">@color/dialer_secondary_text_color</item>
-    <item name="android:textColorHint">@color/dialer_text_hint_color</item>
+    <item name="android:textColorHint">@color/google_grey_600</item>
 
     <!-- These will be automatically used to color most Appcompat/Material widgets. -->
-    <item name="android:colorPrimary">@color/dialer_theme_color</item>
-    <item name="colorPrimary">@color/dialer_theme_color</item>
-    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
-    <item name="colorPrimaryDark">@color/dialer_theme_color_dark</item>
-    <item name="android:colorAccent">@color/dialer_secondary_color</item>
-    <item name="colorAccent">@color/dialer_secondary_color</item>
+    <item name="android:colorPrimary">@color/dialer_dark_theme_color</item>
+    <item name="colorPrimary">@color/dialer_dark_theme_color</item>
+    <item name="android:colorPrimaryDark">@color/dialer_dark_theme_color_dark</item>
+    <item name="colorPrimaryDark">@color/dialer_dark_theme_color_dark</item>
+    <item name="android:colorAccent">@color/dialer_dark_secondary_color</item>
+    <item name="colorAccent">@color/dialer_dark_secondary_color</item>
 
     <!-- Used to automatically style check/selected checkbox, switches and radio buttons -->
     <item name="colorControlActivated">?android:attr/colorPrimary</item>
@@ -58,7 +58,8 @@
     <!-- Dialer specific attributes. -->
     <item name="colorIcon">?android:attr/textColorSecondary</item>
     <item name="colorIconSecondary">?android:attr/textColorSecondary</item>
-    <item name="colorTextOnUnthemedDarkBackground">@color/dialer_primary_text_color_inverse</item>
-    <item name="colorIconOnUnthemedDarkBackground">@color/dialer_icon_color_white</item>
+    <item name="colorTextOnUnthemedDarkBackground">@android:color/white</item>
+    <item name="colorIconOnUnthemedDarkBackground">@android:color/white</item>
+    <item name="colorPrimary20pct">@color/dialer_dark_theme_color_20pct</item>
   </style>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml b/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
index 667b9726d..c9d4d48f4 100644
--- a/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
+++ b/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
@@ -21,6 +21,12 @@
     <!-- These are used to style all actionbars in Dialer. These aren't needed in Dialer.ThemeBase.NoActionBar -->
     <item name="actionBarStyle">@style/DialerActionBarBaseStyle</item>
     <item name="actionBarSize">@dimen/action_bar_height</item>
+
+    <!-- Pulled from Theme.AppCompat.Light.DarkActionbar-->
+    <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+    <item name="actionBarWidgetTheme">@null</item>
+    <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+    <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>
   </style>
 
   <style name="Dialer.ThemeBase.NoActionBar">
@@ -33,15 +39,15 @@
   <!-- Activities and Applications should inherit from one of the themes above. -->
   <style name="Dialer.ThemeBase">
     <!-- These values should be used to color all backgrounds. -->
-    <item name="android:colorBackground">@color/dialer_background_light</item>
-    <item name="android:colorBackgroundFloating">@color/dialer_background_floating_light</item>
+    <item name="android:colorBackground">#FAFAFA</item>
+    <item name="android:colorBackgroundFloating">@android:color/white</item>
 
     <!-- These values should be used to set text color. -->
     <item name="android:textColorPrimary">@color/dialer_primary_text_color</item>
     <item name="android:textColorSecondary">@color/dialer_secondary_text_color</item>
-    <item name="android:textColorPrimaryInverse">@color/dialer_primary_text_color_inverse</item>
-    <item name="android:textColorSecondaryInverse">@color/dialer_secondary_text_color_inverse</item>
-    <item name="android:textColorHint">@color/dialer_text_hint_color</item>
+    <item name="android:textColorPrimaryInverse">@color/google_grey_300</item>
+    <item name="android:textColorSecondaryInverse">@color/google_grey_400</item>
+    <item name="android:textColorHint">@color/google_grey_600</item>
 
     <!-- These will be automatically used to color most Appcompat/Material widgets. -->
     <item name="android:colorPrimary">@color/dialer_theme_color</item>
@@ -55,10 +61,15 @@
     <item name="colorControlActivated">?android:attr/colorPrimary</item>
 
     <!-- Dialer specific attributes. -->
-    <item name="colorIcon">@color/dialer_secondary_text_color</item>
-    <item name="colorIconSecondary">@color/dialer_icon_color_secondary</item>
-    <item name="colorTextOnUnthemedDarkBackground">@color/dialer_primary_text_color_inverse</item>
-    <item name="colorIconOnUnthemedDarkBackground">@color/dialer_icon_color_white</item>
+    <item name="colorIcon">@color/google_grey_700</item>
+    <item name="colorIconSecondary">@color/google_grey_400</item>
+    <item name="colorTextOnUnthemedDarkBackground">@android:color/white</item>
+    <item name="colorIconOnUnthemedDarkBackground">@android:color/white</item>
+    <item name="colorMobileTerminatingChatText">@color/google_blue_100</item>
+    <item name="colorMobileTerminatingChatBackground">@color/google_blue_900</item>
+    <item name="colorMobileOriginatingChatText">@color/google_grey_900</item>
+    <item name="colorMobileOriginatingChatBackground">@color/google_grey_100</item>
+    <item name="colorPrimary20pct">@color/dialer_theme_color_20pct</item>
   </style>
 
   <!-- TODO(a bug): investigate making this style's parent Dialer.ThemeBase.NoActionBar -->
diff --git a/java/com/android/dialer/theme/common/res/values/colors.xml b/java/com/android/dialer/theme/common/res/values/colors.xml
index 8f5976703..1831862b1 100644
--- a/java/com/android/dialer/theme/common/res/values/colors.xml
+++ b/java/com/android/dialer/theme/common/res/values/colors.xml
@@ -20,6 +20,7 @@
   <color name="dialer_end_call_button_color">#BD2A2A</color>
   <color name="dialer_divider_line_color">#D8D8D8</color>
   <color name="dialer_link_color">#2A56C6</color>
+  <color name="dialer_snackbar_action_text_color">#4285F4</color>
 
   <!-- Colors for the notification actions -->
   <color name="notification_action_accept">#097138</color>
diff --git a/java/com/android/dialer/theme/hidden/res/color/dialer_dark_primary_text_color.xml b/java/com/android/dialer/theme/hidden/res/color/dialer_dark_primary_text_color.xml
index 82e79c631..703e40bed 100644
--- a/java/com/android/dialer/theme/hidden/res/color/dialer_dark_primary_text_color.xml
+++ b/java/com/android/dialer/theme/hidden/res/color/dialer_dark_primary_text_color.xml
@@ -16,6 +16,6 @@
   -->
 <!-- Primary text color in the Phone app -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_enabled="false" android:color="@color/dialer_dark_text_color_disabled"/>
-  <item android:color="@color/dialer_dark_primary_text_color_enabled"/>
+  <item android:state_enabled="false" android:color="@color/google_grey_700"/>
+  <item android:color="@color/google_grey_400"/>
 </selector>
diff --git a/java/com/android/dialer/theme/hidden/res/color/dialer_dark_secondary_text_color.xml b/java/com/android/dialer/theme/hidden/res/color/dialer_dark_secondary_text_color.xml
index d057f9e65..486669f91 100644
--- a/java/com/android/dialer/theme/hidden/res/color/dialer_dark_secondary_text_color.xml
+++ b/java/com/android/dialer/theme/hidden/res/color/dialer_dark_secondary_text_color.xml
@@ -16,6 +16,6 @@
   -->
 <!-- Secondary text color in the Phone app -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_enabled="false" android:color="@color/dialer_dark_text_color_disabled"/>
-  <item android:color="@color/dialer_dark_secondary_text_color_enabled"/>
+  <item android:state_enabled="false" android:color="@color/google_grey_700"/>
+  <item android:color="@color/google_grey_300"/>
 </selector>
diff --git a/java/com/android/dialer/theme/hidden/res/color/dialer_primary_text_color.xml b/java/com/android/dialer/theme/hidden/res/color/dialer_primary_text_color.xml
index 6612b17ab..58aa2b0e1 100644
--- a/java/com/android/dialer/theme/hidden/res/color/dialer_primary_text_color.xml
+++ b/java/com/android/dialer/theme/hidden/res/color/dialer_primary_text_color.xml
@@ -16,6 +16,6 @@
   -->
 <!-- Primary text color in the Phone app -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_enabled="false" android:color="@color/dialer_text_color_disabled"/>
-  <item android:color="@color/dialer_primary_text_color_enabled"/>
+  <item android:state_enabled="false" android:color="@color/google_grey_400"/>
+  <item android:color="@color/google_grey_900"/>
 </selector>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/hidden/res/color/dialer_secondary_text_color.xml b/java/com/android/dialer/theme/hidden/res/color/dialer_secondary_text_color.xml
index e1c000aef..20dfd3528 100644
--- a/java/com/android/dialer/theme/hidden/res/color/dialer_secondary_text_color.xml
+++ b/java/com/android/dialer/theme/hidden/res/color/dialer_secondary_text_color.xml
@@ -16,6 +16,6 @@
   -->
 <!-- Secondary text color in the Phone app -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_enabled="false" android:color="@color/dialer_text_color_disabled"/>
-  <item android:color="@color/dialer_secondary_text_color_enabled"/>
+  <item android:state_enabled="false" android:color="@color/google_grey_400"/>
+  <item android:color="@color/google_grey_700"/>
 </selector>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/hidden/res/color/settings_text_color_primary.xml b/java/com/android/dialer/theme/hidden/res/color/settings_text_color_primary.xml
index 7a14d22fa..b26c2c2f0 100644
--- a/java/com/android/dialer/theme/hidden/res/color/settings_text_color_primary.xml
+++ b/java/com/android/dialer/theme/hidden/res/color/settings_text_color_primary.xml
@@ -18,6 +18,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/dialer_text_color_disabled" android:state_enabled="false"/>
-  <item android:color="@color/dialer_primary_text_color_enabled"/>
+  <item android:color="@color/google_grey_400" android:state_enabled="false"/>
+  <item android:color="@color/google_grey_900"/>
 </selector>
diff --git a/java/com/android/dialer/theme/hidden/res/color/settings_text_color_secondary.xml b/java/com/android/dialer/theme/hidden/res/color/settings_text_color_secondary.xml
index c4baefd33..21e125a69 100644
--- a/java/com/android/dialer/theme/hidden/res/color/settings_text_color_secondary.xml
+++ b/java/com/android/dialer/theme/hidden/res/color/settings_text_color_secondary.xml
@@ -18,6 +18,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/dialer_text_color_disabled" android:state_enabled="false"/>
-  <item android:color="@color/dialer_secondary_text_color_enabled"/>
+  <item android:color="@color/google_grey_400" android:state_enabled="false"/>
+  <item android:color="@color/google_grey_700"/>
 </selector>
diff --git a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_dark.xml b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_dark.xml
index 7dc894be9..e48474e9f 100644
--- a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_dark.xml
+++ b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_dark.xml
@@ -15,26 +15,8 @@
   -->
 <resources>
   <!-- Essential theme colors -->
-  <color name="dialer_dark_theme_color">#2A56C6</color>
-  <color name="dialer_dark_theme_color_dark">#1C3AA9</color>
-  <color name="dialer_dark_secondary_color">#F50057</color>
-  <color name="dialer_dark_theme_color_20pct">#332A56C6</color>
-
-  <!-- Text colors -->
-  <color name="dialer_dark_primary_text_color_enabled">#FFFFFF</color>
-  <color name="dialer_dark_secondary_text_color_enabled">#DDFFFFFF</color>
-  <color name="dialer_dark_text_color_disabled">#333333</color>
-  <color name="dialer_dark_text_hint_color">#DE78909C</color>
-  <color name="dialer_dark_primary_text_color_inverse">#212121</color>
-  <color name="dialer_dark_secondary_text_color_inverse">#636363</color>
-  <color name="dialer_dark_snackbar_action_text_color">#4285F4</color>
-
-  <!-- Background colors -->
-  <color name="dialer_dark_background">#212121</color>
-  <color name="dialer_dark_background_floating">#000000</color>
-
-  <!-- Other useful colors -->
-  <color name="dialer_dark_icon_color">#C4000000</color>
-  <color name="dialer_icon_color_secondary">#E1E1E1</color>
-  <color name="dialer_icon_color_white">#FFFFFF</color>
+  <color name="dialer_dark_theme_color">#5195EA</color>
+  <color name="dialer_dark_theme_color_20pct">#335195EA</color>
+  <color name="dialer_dark_theme_color_dark">#2374CE</color>
+  <color name="dialer_dark_secondary_color">#5195EA</color>
 </resources>
diff --git a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
index 1d5a1e7ee..0ed8e7566 100644
--- a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
+++ b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
@@ -14,38 +14,9 @@
   ~ limitations under the License
   -->
 <resources>
-  <!-- Note: The following colors are used in the Dialer settings screens.  Since Dialer's settings
-       link into the Telephony settings as well, changes to these colors should be mirrored in
-       Telephony:
-
-       Android source path: packages/apps/PhoneCommon/res/values/colors.xml
-         - Local: dialer_theme_color         Android Source: dialer_theme_color
-         - Local: dialer_theme_color_dark    Android Source: dialer_theme_color_dark
-       Android source path: packages/services/Telecomm/res/values/colors.xml
-         - Local: dialer_theme_color         Android Source: theme_color
-         - Local: dialer_theme_color_dark    Android Source: dialer_settings_color_dark
-       -->
   <!-- Essential theme colors -->
   <color name="dialer_theme_color">#2A56C6</color>
+  <color name="dialer_theme_color_20pct">#332A56C6</color>
   <color name="dialer_theme_color_dark">#1C3AA9</color>
   <color name="dialer_secondary_color">#F50057</color>
-  <color name="dialer_theme_color_20pct">#332A56C6</color>
-
-  <!-- Text colors -->
-  <color name="dialer_primary_text_color_enabled">#212121</color>
-  <color name="dialer_secondary_text_color_enabled">#636363</color>
-  <color name="dialer_text_color_disabled">#9E9E9E</color>
-  <color name="dialer_text_hint_color">#DE78909C</color>
-  <color name="dialer_primary_text_color_inverse">#FFFFFF</color>
-  <color name="dialer_secondary_text_color_inverse">#DDFFFFFF</color>
-  <color name="dialer_snackbar_action_text_color">#4285F4</color>
-
-  <!-- Background colors -->
-  <color name="dialer_background_light">#FAFAFA</color>
-  <color name="dialer_background_floating_light">#FFFFFF</color>
-
-  <!-- Other useful colors -->
-  <color name="dialer_icon_color">#89000000</color>
-  <color name="dialer_icon_color_secondary">#E1E1E1</color>
-  <color name="dialer_icon_color_white">#FFFFFF</color>
 </resources>
diff --git a/java/com/android/dialer/theme/hidden/res/values/colors_pallet.xml b/java/com/android/dialer/theme/hidden/res/values/colors_pallet.xml
new file mode 100644
index 000000000..7a092b28f
--- /dev/null
+++ b/java/com/android/dialer/theme/hidden/res/values/colors_pallet.xml
@@ -0,0 +1,35 @@
+<!--
+  ~ 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>
+  <color name="google_blue_900">#174EA6</color>
+  <color name="google_blue_800">#185ABC</color>
+  <color name="google_blue_700">#1967D2</color>
+  <color name="google_blue_600">#1A73E8</color>
+  <color name="google_blue_500">#4285F4</color>
+  <color name="google_blue_100">#D2E3FC</color>
+  <color name="google_blue_50">#E8F0FE</color>
+
+  <color name="google_grey_900">#202124</color>
+  <color name="google_grey_800">#3C4043</color>
+  <color name="google_grey_700">#5F6368</color>
+  <color name="google_grey_600">#80868B</color>
+  <color name="google_grey_500">#9AA0A6</color>
+  <color name="google_grey_400">#BDC1C6</color>
+  <color name="google_grey_300">#DADCE0</color>
+  <color name="google_grey_200">#E8EAED</color>
+  <color name="google_grey_100">#F1F3F4</color>
+  <color name="google_grey_50">#F8F9FA</color>
+</resources>
diff --git a/java/com/android/dialer/theme/hidden/res/values/styles.xml b/java/com/android/dialer/theme/hidden/res/values/styles.xml
index 90e452993..44a35f8a2 100644
--- a/java/com/android/dialer/theme/hidden/res/values/styles.xml
+++ b/java/com/android/dialer/theme/hidden/res/values/styles.xml
@@ -55,5 +55,7 @@
     <!-- TODO(a bug): figure out why ?android:attr/colorPrimary doesn't work here -->
     <item name="android:colorAccent">@color/dialer_theme_color</item>
     <item name="colorAccent">@color/dialer_theme_color</item>
+    <item name="android:textColorPrimary">@color/dialer_primary_text_color</item>
+    <item name="android:textColorSecondary">@color/dialer_secondary_text_color</item>
   </style>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/drawable/shape_chip_drawable.xml b/java/com/android/incallui/answer/impl/res/drawable/shape_chip_drawable.xml
index 3740f3d1b..0cf4897e7 100644
--- a/java/com/android/incallui/answer/impl/res/drawable/shape_chip_drawable.xml
+++ b/java/com/android/incallui/answer/impl/res/drawable/shape_chip_drawable.xml
@@ -18,7 +18,7 @@
     android:color="#DADCE0">
   <item android:id="@android:id/mask">
     <shape xmlns:android="http://schemas.android.com/apk/res/android">
-      <solid android:color="@color/dialer_background_light"/>
+      <solid android:color="?android:attr/colorBackground"/>
       <padding
           android:bottom="9dp"
           android:left="8dp"
@@ -29,7 +29,7 @@
   </item>
   <item>
     <shape xmlns:android="http://schemas.android.com/apk/res/android">
-      <solid android:color="@color/dialer_background_floating_light"/>
+      <solid android:color="?android:attr/colorBackgroundFloating"/>
       <stroke
           android:width="1dp"
           android:color="#DADCE0"/>
diff --git a/java/com/android/incallui/theme/res/values/colors.xml b/java/com/android/incallui/theme/res/values/colors.xml
index cb894bbb7..059fe59a9 100644
--- a/java/com/android/incallui/theme/res/values/colors.xml
+++ b/java/com/android/incallui/theme/res/values/colors.xml
@@ -25,9 +25,6 @@
   <!-- Background color for status bar. For portrait this will be ignored. -->
   <color name="statusbar_background_color">?android:attr/colorPrimary</color>
 
-  <!-- 20% opacity, theme color. -->
-  <color name="incall_dialpad_touch_tint">@color/dialer_theme_color_20pct</color>
-
   <!-- Background colors for InCallUI. This is a set of colors which pass WCAG
        AA and all have a contrast ratio over 5:1.
 
diff --git a/java/com/android/incallui/theme/res/values/styles.xml b/java/com/android/incallui/theme/res/values/styles.xml
index 58608aca3..0ea09588d 100644
--- a/java/com/android/incallui/theme/res/values/styles.xml
+++ b/java/com/android/incallui/theme/res/values/styles.xml
@@ -25,7 +25,7 @@
     <item name="android:navigationBarColor">@android:color/transparent</item>
     <item name="android:windowDrawsSystemBarBackgrounds">true</item>
 
-    <item name="dialpad_key_button_touch_tint">@color/incall_dialpad_touch_tint</item>
+    <item name="dialpad_key_button_touch_tint">?attr/colorPrimary20pct</item>
     <item name="dialpad_style">@style/InCallDialpad</item>
     <item name="android:windowAnimationStyle">@null</item>
 
@@ -38,7 +38,7 @@
     <item name="android:navigationBarColor">@android:color/transparent</item>
     <item name="android:windowDrawsSystemBarBackgrounds">true</item>
 
-    <item name="dialpad_key_button_touch_tint">@color/incall_dialpad_touch_tint</item>
+    <item name="dialpad_key_button_touch_tint">?attr/colorPrimary20pct</item>
     <item name="dialpad_style">@style/InCallDialpad</item>
     <item name="android:windowAnimationStyle">@null</item>
 
-- 
cgit v1.2.3