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
---
 .../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 ++
 10 files changed, 54 insertions(+), 64 deletions(-)
 create mode 100644 java/com/android/dialer/theme/hidden/res/values/colors_pallet.xml

(limited to 'java/com/android/dialer/theme/hidden/res')

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>
-- 
cgit v1.2.3