From 17273878afef47db737aec25d5dc37b48b573226 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Mon, 10 Oct 2022 14:30:21 +0530
Subject: [PATCH 1/2] Change app icon to our custom icon

---
 res/drawable/ic_launcher_background.xml | 40 ++++++++++----
 res/drawable/ic_launcher_foreground.xml | 70 +++++++++++++++----------
 res/mipmap-anydpi/ic_launcher.xml       | 26 ++++++---
 3 files changed, 92 insertions(+), 44 deletions(-)

diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
index fc4823054e..f1931a336b 100644
--- a/res/drawable/ic_launcher_background.xml
+++ b/res/drawable/ic_launcher_background.xml
@@ -1,20 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright (C) 2022  E FOUNDATION
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
   <path
-      android:pathData="M0,0h108v108h-108z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M77,51C77,59.837 70,63 61,63C52,63 45,59.837 45,51C45,38.163 52,31 61,31C70,31 77,38.163 77,51Z"
-      android:fillColor="#4D84E9"/>
-  <path
-      android:pathData="M71,49C68.569,50.255 64.821,51 61,51C57.179,51 53.431,50.255 51,49C52.093,52.47 54.333,57 61,57C67.667,57 69.907,52.47 71,49Z"
-      android:fillColor="#ffffff"/>
+      android:pathData="M0,0h108v108h-108z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="54"
+          android:startY="7.15"
+          android:endX="54"
+          android:endY="208.35"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFD8DDDF"/>
+        <item android:offset="1" android:color="#FF949DA1"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
index 686ffa2b53..e305355101 100644
--- a/res/drawable/ic_launcher_foreground.xml
+++ b/res/drawable/ic_launcher_foreground.xml
@@ -1,36 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright (C) 2022  E FOUNDATION
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group>
-    <clip-path
-        android:pathData="M0,0h108v108h-108z"/>
-    <path
-        android:pathData="M64,64C64,72.837 57,76 48,76C39,76 32,72.837 32,64C32,51.163 39,44 48,44C57,44 64,51.163 64,64Z"
-        android:fillColor="#193057"/>
-    <path
-        android:pathData="M58,62C55.569,63.255 51.821,64 48,64C44.179,64 40.431,63.255 38,62C39.093,65.47 41.333,70 48,70C54.667,70 56.907,65.47 58,62Z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
-        android:fillAlpha="0.6">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:gradientRadius="72"
-            android:centerX="28.54"
-            android:centerY="28.54"
-            android:type="radial">
-          <item android:offset="0" android:color="#19FFFFFF"/>
-          <item android:offset="1" android:color="#00FFFFFF"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
+  <path
+      android:pathData="M45.7,47.13C45.65,46.65 45.65,46.17 45.7,45.69C45.8,45.04 48.37,41.23 48.99,40.88C49.41,40.61 49.87,40.43 50.36,40.35C50.44,40.34 50.51,40.32 50.58,40.28C50.72,40.11 50.92,39.99 51.14,39.95C51.36,39.91 51.59,39.94 51.79,40.04C51.61,39.76 52.07,39.38 52.38,39.42C53.68,39.56 55.01,39.48 56.29,39.79C57.94,40.19 60.54,42.64 60.64,42.75C60.56,42.8 60.54,42.84 60.64,42.89C60.64,42.89 62.15,45.5 62.04,47.08C61.96,48.25 61.81,49.92 61.69,51.1C61.67,51.19 61.68,51.28 61.7,51.37C61.73,51.45 61.77,51.54 61.83,51.6C62.45,52.12 62.29,52.78 62.15,53.4C61.93,54.39 61.65,55.36 61.38,56.33C61.37,56.41 61.35,56.48 61.3,56.54C61.26,56.6 61.2,56.65 61.13,56.69C60.95,56.78 60.8,56.92 60.68,57.08C60.56,57.25 60.48,57.44 60.45,57.64C60.21,58.48 59.84,59.27 59.37,60.01C59.07,60.57 58.96,61.2 59.03,61.83C59.05,62.36 59.09,62.88 59.11,63.41C59.12,63.56 59.18,63.71 59.28,63.82C59.38,63.94 59.52,64.02 59.67,64.04C60.37,64.26 60.58,64.75 60.65,65.44C60.75,66.44 61.08,67.26 62.16,67.75C64.49,68.76 66.78,69.89 69.08,70.98C69.25,71.03 69.41,71.12 69.53,71.26C68.78,71.94 67.98,72.58 67.13,73.15C63.15,75.9 58.41,77.32 53.57,77.22C48.06,77.17 42.74,75.15 38.59,71.52C38.2,71.2 38.21,71.2 38.69,70.96C40.93,69.89 43.17,68.82 45.46,67.84C45.97,67.65 46.41,67.3 46.72,66.85C47.03,66.4 47.19,65.87 47.18,65.32C47.22,64.52 47.35,64.34 48.11,64.09C48.29,64.04 48.44,63.93 48.55,63.78C48.66,63.64 48.71,63.46 48.7,63.27C48.7,62.58 48.73,61.91 48.75,61.19C48.74,60.94 48.69,60.68 48.59,60.44C48.23,59.5 47.86,59.08 47.52,58.11C47.33,57.54 47.02,57.01 46.61,56.57C46.29,56.15 46.09,55.64 46.04,55.12C45.88,54.48 45.77,53.83 45.63,53.19C45.55,52.97 45.49,52.74 45.47,52.5C45.47,52.09 45.47,51.79 45.92,51.59C46.15,51.49 46.09,51.22 46.07,51.01C45.94,49.91 45.82,48.27 45.7,47.13Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="53.91"
+          android:startY="54.66"
+          android:endX="53.91"
+          android:endY="126.78"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FFCBD6EA"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M54,31.79C59.89,31.8 65.53,34.14 69.7,38.3C73.86,42.47 76.2,48.11 76.21,54C76.2,59.89 73.86,65.54 69.7,69.7C65.53,73.86 59.89,76.21 54,76.21C48.11,76.21 42.46,73.86 38.3,69.7C34.14,65.53 31.79,59.89 31.79,54C31.79,48.11 34.14,42.47 38.3,38.3C42.46,34.14 48.11,31.8 54,31.79ZM54,29.28C47.44,29.28 41.16,31.89 36.52,36.52C31.89,41.16 29.28,47.44 29.28,54C29.28,60.56 31.89,66.84 36.52,71.48C41.16,76.11 47.44,78.72 54,78.72C57.24,78.72 60.46,78.08 63.46,76.84C66.46,75.59 69.18,73.77 71.48,71.48C73.77,69.18 75.59,66.46 76.84,63.46C78.08,60.46 78.72,57.25 78.72,54C78.72,50.75 78.08,47.54 76.84,44.54C75.59,41.54 73.77,38.82 71.48,36.52C69.18,34.23 66.46,32.41 63.46,31.16C60.46,29.92 57.24,29.28 54,29.28Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="53.98"
+          android:startY="49.21"
+          android:endX="53.98"
+          android:endY="143.51"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FFCBD6EA"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index 3d90bc5c33..900ba3d685 100644
--- a/res/mipmap-anydpi/ic_launcher.xml
+++ b/res/mipmap-anydpi/ic_launcher.xml
@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright (C) 2022  E FOUNDATION
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground> 
+        <inset android:drawable="@drawable/ic_launcher_foreground" android:inset="5%" />
+    </foreground>
+</adaptive-icon>
\ No newline at end of file
-- 
GitLab


From c7b6df65db4b1c3aa197c4a94c04f9c0c341381c Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Mon, 10 Oct 2022 16:15:38 +0530
Subject: [PATCH 2/2] Theme app according to our palette

---
 Android.bp                                    |   1 +
 res/drawable-anydpi-v26/fab_pink.xml          |  28 +++++
 ...ite_540dp.png => ic_person_white_base.png} | Bin
 ...ite_540dp.png => ic_person_white_base.png} | Bin
 ...ite_540dp.png => ic_person_white_base.png} | Bin
 ...ite_540dp.png => ic_person_white_base.png} | Bin
 ...ite_540dp.png => ic_person_white_base.png} | Bin
 res/drawable/person_white_540dp.xml           |  19 +++
 res/drawable/quantum_ic_drawer_my_info_32.xml |  10 +-
 res/layout-land/people_activity_toolbar.xml   |   2 +-
 res/layout/contact_editor_activity.xml        |   2 +-
 res/layout/contact_editor_fields.xml          |   2 +-
 res/layout/people_activity_toolbar.xml        |   2 +-
 res/layout/search_bar_expanded.xml            |   4 +-
 res/layout/selection_bar.xml                  |   2 +-
 res/values-night/colors.xml                   |   2 +-
 res/values-v27/styles.xml                     |  16 +--
 res/values/colors.xml                         | 116 +++++++++---------
 res/values/lineage_colors.xml                 |   4 +-
 res/values/styles.xml                         |  28 +++--
 .../contacts/activities/PeopleActivity.java   |   4 +-
 .../contacts/drawer/DrawerAdapter.java        |   2 +-
 .../lettertiles/LetterTileDrawable.java       |   1 -
 .../contacts/util/MaterialColorMapUtils.java  |   4 +-
 24 files changed, 147 insertions(+), 102 deletions(-)
 create mode 100644 res/drawable-anydpi-v26/fab_pink.xml
 rename res/drawable-hdpi/{person_white_540dp.png => ic_person_white_base.png} (100%)
 rename res/drawable-mdpi/{person_white_540dp.png => ic_person_white_base.png} (100%)
 rename res/drawable-xhdpi/{person_white_540dp.png => ic_person_white_base.png} (100%)
 rename res/drawable-xxhdpi/{person_white_540dp.png => ic_person_white_base.png} (100%)
 rename res/drawable-xxxhdpi/{person_white_540dp.png => ic_person_white_base.png} (100%)
 create mode 100644 res/drawable/person_white_540dp.xml

diff --git a/Android.bp b/Android.bp
index 27c5b2f4e1..0dd40c4521 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,6 +52,7 @@ android_app {
         "com.android.vcard",
         "guava",
         "libphonenumber",
+        "elib",
     ],
 
     certificate: "shared",
diff --git a/res/drawable-anydpi-v26/fab_pink.xml b/res/drawable-anydpi-v26/fab_pink.xml
new file mode 100644
index 0000000000..deea990297
--- /dev/null
+++ b/res/drawable-anydpi-v26/fab_pink.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022  E FOUNDATION
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid
+        android:color="@color/e_accent"/>
+
+    <size
+        android:width="24dp"
+        android:height="24dp"/>
+</shape>
diff --git a/res/drawable-hdpi/person_white_540dp.png b/res/drawable-hdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-hdpi/person_white_540dp.png
rename to res/drawable-hdpi/ic_person_white_base.png
diff --git a/res/drawable-mdpi/person_white_540dp.png b/res/drawable-mdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-mdpi/person_white_540dp.png
rename to res/drawable-mdpi/ic_person_white_base.png
diff --git a/res/drawable-xhdpi/person_white_540dp.png b/res/drawable-xhdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-xhdpi/person_white_540dp.png
rename to res/drawable-xhdpi/ic_person_white_base.png
diff --git a/res/drawable-xxhdpi/person_white_540dp.png b/res/drawable-xxhdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-xxhdpi/person_white_540dp.png
rename to res/drawable-xxhdpi/ic_person_white_base.png
diff --git a/res/drawable-xxxhdpi/person_white_540dp.png b/res/drawable-xxxhdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-xxxhdpi/person_white_540dp.png
rename to res/drawable-xxxhdpi/ic_person_white_base.png
diff --git a/res/drawable/person_white_540dp.xml b/res/drawable/person_white_540dp.xml
new file mode 100644
index 0000000000..479c55cbb9
--- /dev/null
+++ b/res/drawable/person_white_540dp.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_person_white_base"
+    android:tint="@color/e_background"/>
\ No newline at end of file
diff --git a/res/drawable/quantum_ic_drawer_my_info_32.xml b/res/drawable/quantum_ic_drawer_my_info_32.xml
index 4e310cb4a1..b0b0f16afe 100644
--- a/res/drawable/quantum_ic_drawer_my_info_32.xml
+++ b/res/drawable/quantum_ic_drawer_my_info_32.xml
@@ -5,15 +5,11 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M15.8,1C7.5,1 0.9,7.7 1,16c0.1,8.3 6.9,15 15.2,15S31.1,24.3 31,16C30.9,7.7 24.1,1 15.8,1z"
-        android:fillColor="#4185F3"/>
+        android:fillColor="@color/e_accent"/>
     <path
         android:pathData="M16,12.3m-3.8,0a3.8,3.8 0,1 1,7.6 0a3.8,3.8 0,1 1,-7.6 0"
-        android:fillAlpha="0.2"
-        android:fillColor="#FFFFFF"
-        android:strokeAlpha="0.2"/>
+        android:fillColor="@color/e_background" />
     <path
         android:pathData="M23.5,23.5h-15v-1.9c0,-2.5 5,-3.8 7.5,-3.8s7.5,1.3 7.5,3.8V23.5z"
-        android:fillAlpha="0.2"
-        android:fillColor="#FFFFFF"
-        android:strokeAlpha="0.2"/>
+        android:fillColor="@color/e_background" />
 </vector>
diff --git a/res/layout-land/people_activity_toolbar.xml b/res/layout-land/people_activity_toolbar.xml
index 15f12f6718..eb33d39578 100644
--- a/res/layout-land/people_activity_toolbar.xml
+++ b/res/layout-land/people_activity_toolbar.xml
@@ -29,7 +29,7 @@
         android:id="@+id/toolbar_frame"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary">
+        android:background="@color/actionbar_background_color">
 
         <!-- the attribute padding removes the gap between this Toolbar and its parent FrameLayout on tablet -->
         <androidx.appcompat.widget.Toolbar
diff --git a/res/layout/contact_editor_activity.xml b/res/layout/contact_editor_activity.xml
index 5843a58cdd..e7eb9c91c8 100644
--- a/res/layout/contact_editor_activity.xml
+++ b/res/layout/contact_editor_activity.xml
@@ -27,7 +27,7 @@
         style="@style/EditorActionBarStyle"
         android:layout_width="match_parent"
         android:layout_height="?android:attr/actionBarSize"
-        android:background="?android:attr/colorPrimary"
+        android:background="@color/actionbar_background_color"
         android:elevation="4dp"
         app:navigationContentDescription="@string/cancel_button_content_description"
         app:navigationIcon="@drawable/quantum_ic_close_vd_theme_24"
diff --git a/res/layout/contact_editor_fields.xml b/res/layout/contact_editor_fields.xml
index b9bda16980..93517446e1 100644
--- a/res/layout/contact_editor_fields.xml
+++ b/res/layout/contact_editor_fields.xml
@@ -43,7 +43,7 @@
                 android:gravity="center_vertical"
                 android:text="@string/editor_more_fields"
                 android:textAlignment="viewStart"
-                android:textColor="?android:attr/colorAccent"
+                android:textColor="@color/e_primary_text_color"
                 android:textSize="@dimen/expanding_entry_card_title_text_size"/>
 
     </LinearLayout>
diff --git a/res/layout/people_activity_toolbar.xml b/res/layout/people_activity_toolbar.xml
index 4e8ea2f7e1..1bc4652dd1 100644
--- a/res/layout/people_activity_toolbar.xml
+++ b/res/layout/people_activity_toolbar.xml
@@ -25,7 +25,7 @@
         android:id="@+id/toolbar_frame"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary">
+        android:background="@color/actionbar_background_color">
 
         <!-- the attribute padding removes the gap between this Toolbar and its parent FrameLayout on tablet -->
         <androidx.appcompat.widget.Toolbar
diff --git a/res/layout/search_bar_expanded.xml b/res/layout/search_bar_expanded.xml
index 9f90bc7d09..8f9c6089bf 100644
--- a/res/layout/search_bar_expanded.xml
+++ b/res/layout/search_bar_expanded.xml
@@ -30,7 +30,7 @@
         android:src="@drawable/quantum_ic_arrow_back_vd_theme_24"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_menu_back_from_search"
-        android:tint="@color/actionbar_background_color" />
+        android:tint="@color/e_primary_text_color" />
 
     <android.widget.AutoCompleteTextView
         android:id="@+id/search_view"
@@ -54,7 +54,7 @@
         android:layout_width="@dimen/search_box_close_icon_size"
         android:padding="@dimen/search_box_close_icon_padding"
         android:src="@drawable/quantum_ic_close_vd_theme_24"
-        android:tint="@color/quantum_black_secondary_text"
+        android:tint="@color/e_secondary_text_color"
         android:clickable="true"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/description_clear_search" />
diff --git a/res/layout/selection_bar.xml b/res/layout/selection_bar.xml
index 272a2fcf9d..0d9f8a8ef4 100644
--- a/res/layout/selection_bar.xml
+++ b/res/layout/selection_bar.xml
@@ -51,7 +51,7 @@
         android:paddingEnd="16dp"
         android:paddingStart="16dp"
         android:text="@string/menu_add_contacts"
-        android:textColor="@color/primary_color"
+        android:textColor="@color/actionbar_text_color"
         android:textStyle="bold"
         android:visibility="gone"/>
 
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index e88ed65b73..a242b5e9c2 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -5,7 +5,7 @@
 -->
 <resources>
     <!-- Background color of pinned header items. -->
-    <color name="list_item_pinned_header_color">#1f1f1f</color>
+    <color name="list_item_pinned_header_color">@color/background_primary</color>
 
     <!-- Color of contact name in list. -->
     <color name="contact_list_name_text_color">#dadada</color>
diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml
index e821cc1570..0187a5cabc 100644
--- a/res/values-v27/styles.xml
+++ b/res/values-v27/styles.xml
@@ -12,8 +12,8 @@
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="android:windowBackground">@color/background_primary</item>
         <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
-        <item name="android:colorPrimary">@color/primary_color</item>
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorPrimary">@color/e_accent</item>
+        <item name="android:colorAccent">@color/e_accent</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogTheme</item>
         <item name="list_item_height">@dimen/contact_browser_list_item_height</item>
         <item name="list_section_header_height">24dip</item>
@@ -51,10 +51,11 @@
         <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
         <item name="android:navigationBarColor">@color/navigation_bar_bg</item>
         <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightNavigationBar">@bool/isLight</item>
+        <item name="android:windowLightStatusBar">@bool/isLight</item>
     </style>
 
-    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="android:forceDarkAllowed">true</item>
         <!-- Styles that require AppCompat compatibility, remember to update both sets -->
         <item name="android:actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>
@@ -73,8 +74,8 @@
         <item name="android:windowBackground">@color/background_primary</item>
         <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
-        <item name="android:colorPrimary">@color/primary_color</item>
-        <item name="colorPrimary">@color/primary_color</item>
+        <item name="android:colorPrimary">@color/e_accent</item>
+        <item name="colorPrimary">@color/e_accent</item>
         <item name="android:colorAccent">@color/primary_color</item>
         <item name="colorAccent">@color/primary_color</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
@@ -120,7 +121,8 @@
         <item name="popupMenuStyle">@style/PopupMenuStyleAppCompat</item>
         <item name="android:navigationBarColor">@color/navigation_bar_bg</item>
         <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightNavigationBar">@bool/isLight</item>
+        <item name="android:windowLightStatusBar">@bool/isLight</item>
     </style>
 
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index aeba877162..51eb19d11d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,39 +17,39 @@
     <color name="ic_add_contact_shortcut_background">#F5F5F5</color>
 
     <!-- 87% black -->
-    <color name="quantum_black_text">#dd000000</color>
+    <color name="quantum_black_text">@color/e_primary_text_color</color>
 
     <!-- 54% black -->
-    <color name="quantum_black_secondary_text">#89000000</color>
+    <color name="quantum_black_secondary_text">@color/e_secondary_text_color</color>
 
     <!-- 38% black -->
-    <color name="quantum_black_hint_text">#61000000</color>
+    <color name="quantum_black_hint_text">@color/e_disabled_color</color>
 
-    <color name="quickcontact_entry_sub_header_text_color">#737373</color>
+    <color name="quickcontact_entry_sub_header_text_color">@color/e_secondary_text_color</color>
     <color name="quickcontact_entry_header_text_color">#202020</color>
 
     <color name="action_bar_background">#2a56c6</color>
 
     <color name="nav_item_selected_background">#0f000000</color>
 
-    <color name="action_bar_button_text_color">#FFFFFF</color>
+    <color name="action_bar_button_text_color">@color/e_primary_text_color</color>
 
-    <color name="actionbar_background_color">@color/primary_color</color>
+    <color name="actionbar_background_color">@color/e_action_bar</color>
 
-    <color name="contextual_selection_bar_color">#f6f6f6</color>
+    <color name="contextual_selection_bar_color">@color/e_action_bar</color>
     <!-- Color of the status bar above the contextual selection bar. -->
-    <color name="contextual_selection_bar_status_bar_color">#bababa</color>
+    <color name="contextual_selection_bar_status_bar_color">@color/e_action_bar</color>
 
-    <color name="primary_color_dark">#1c3aa9</color>
-    <color name="primary_color">#2a56c6</color>
+    <color name="primary_color_dark">@color/e_action_bar</color>
+    <color name="primary_color">@color/e_accent</color>
 
-    <color name="group_primary_color_dark">#546E7A</color>
-    <color name="group_primary_color">#607D8B</color>
+    <color name="group_primary_color_dark">@color/e_action_bar</color>
+    <color name="group_primary_color">@color/e_action_bar</color>
 
     <!-- Color of the selected tab underline -->
     <color name="contacts_accent_color">#FFFFFF</color>
 
-    <color name="floating_action_button_icon_color">@color/contacts_accent_color</color>
+    <color name="floating_action_button_icon_color">@color/e_background</color>
 
     <!-- Horizontal separator line should be 12% dark in the light theme. -->
     <color name="divider_line_color_light">#e0e0e0</color>
@@ -61,7 +61,7 @@
     <color name="expanding_entry_card_background_color">#ffffff</color>
 
     <!-- Color of the margin for cards -->
-    <color name="card_margin_color">#f4f4f4</color>
+    <color name="card_margin_color">@color/e_background</color>
 
     <color name="call_arrow_green">#2aad6f</color>
     <color name="call_arrow_red">#ff2e58</color>
@@ -73,7 +73,7 @@
     <color name="editor_icon_color">#7f7f7f</color>
 
     <!-- Color of disabled text and unfocused hint text inside the contact editor. 25% black. -->
-    <color name="editor_disabled_text_color">#40000000</color>
+    <color name="editor_disabled_text_color">@color/e_disabled_color</color>
 
     <!-- Color of text on disabled link contacts button, 25% black. -->
     <color name="disabled_button_text">#40000000</color>
@@ -85,7 +85,7 @@
     <color name="disabled_contact_list_name_text">#4D000000</color>
 
     <!-- Color of background of all empty states. -->
-    <color name="empty_state_background">#efefef</color>
+    <color name="empty_state_background">@color/e_background</color>
 
     <!-- Colors of swipeRefreshLayout's spinning circle. -->
     <color name="swipe_refresh_color1">#0f9d58</color>
@@ -97,12 +97,12 @@
     <color name="ripple_material_dark">#a0ffffff</color>
 
     <!-- Divider color for header separator -->
-    <color name="primary_text_color">#363636</color>
+    <color name="primary_text_color">@color/e_primary_text_color</color>
 
-    <color name="secondary_text_color">@color/dialtacts_secondary_text_color</color>
+    <color name="secondary_text_color">@color/e_secondary_text_color</color>
 
     <!-- Text color for section header. -->
-    <color name="section_header_text_color">@color/dialtacts_theme_color</color>
+    <color name="section_header_text_color">@color/e_primary_text_color</color>
 
     <!-- Color of the theme of the People app -->
     <color name="people_app_theme_color">#363636</color>
@@ -117,7 +117,7 @@
     <color name="dialtacts_primary_text_color">#333333</color>
 
     <!-- Secondary text color in the Phone app -->
-    <color name="dialtacts_secondary_text_color">#737373</color>
+    <color name="dialtacts_secondary_text_color">@color/e_secondary_text_color</color>
 
     <color name="shortcut_overlay_text_background">#7f000000</color>
 
@@ -132,39 +132,35 @@
         These colors are also used by MaterialColorMapUtils to generate primary activity colors.
     -->
     <array name="letter_tile_colors">
-        <item>#DB4437</item>
-        <item>#E91E63</item>
-        <item>#9C27B0</item>
-        <item>#673AB7</item>
-        <item>#3F51B5</item>
-        <item>#4285F4</item>
-        <item>#039BE5</item>
-        <item>#0097A7</item>
-        <item>#009688</item>
-        <item>#0F9D58</item>
-        <item>#689F38</item>
-        <item>#EF6C00</item>
-        <item>#FF5722</item>
-        <item>#757575</item>
+        <item>#0F94F6</item>
+        <item>#00B4B4</item>
+        <item>#008D96</item>
+        <item>#44B04C</item>
+        <item>#AFD83D</item>
+        <item>#FFED21</item>
+        <item>#FFC300</item>
+        <item>#FF7A00</item>
+        <item>#F8432E</item>
+        <item>#ED1C61</item>
+        <item>#ED1C61</item>
+        <item>#5754DC</item>
     </array>
 
     <!-- Darker versions of letter_tile_colors, two shades darker. These colors are used
         for settings secondary activity colors. -->
     <array name="letter_tile_colors_dark">
-        <item>#C53929</item>
-        <item>#C2185B</item>
-        <item>#7B1FA2</item>
-        <item>#512DA8</item>
-        <item>#303F9F</item>
-        <item>#3367D6</item>
-        <item>#0277BD</item>
-        <item>#006064</item>
-        <item>#00796B</item>
-        <item>#0B8043</item>
-        <item>#33691E</item>
-        <item>#E65100</item>
-        <item>#E64A19</item>
-        <item>#424242</item>
+        <item>#0F94F6</item>
+        <item>#00B4B4</item>
+        <item>#008D96</item>
+        <item>#44B04C</item>
+        <item>#AFD83D</item>
+        <item>#FFED21</item>
+        <item>#FFC300</item>
+        <item>#FF7A00</item>
+        <item>#F8432E</item>
+        <item>#ED1C61</item>
+        <item>#ED1C61</item>
+        <item>#5754DC</item>
     </array>
 
     <!-- The default color used for tinting photos when no color can be extracted via Palette,
@@ -177,35 +173,35 @@
 
     <color name="letter_tile_default_color">#cccccc</color>
 
-    <color name="letter_tile_font_color">#ffffff</color>
+    <color name="letter_tile_font_color">@android:color/white</color>
 
     <!-- Color for icons in the actionbar -->
-    <color name="actionbar_icon_color">#ffffff</color>
+    <color name="actionbar_icon_color">@color/e_primary_text_color</color>
 
     <!-- Color of the title to the Frequently Contacted section -->
     <color name="frequently_contacted_title_color">@color/actionbar_background_color</color>
 
     <!-- Color of action bar text. Ensure this stays in sync with packages/Telephony
     phone_settings_actionbar_text_color-->
-    <color name="actionbar_text_color">#ffffff</color>
+    <color name="actionbar_text_color">@color/e_primary_text_color</color>
     <!-- 54% black for icons -->
     <color name="actionbar_icon_color_grey">#8C000000</color>
     <!-- 87% black for actionbar text -->
-    <color name="actionbar_text_color_black">#DF000000</color>
+    <color name="actionbar_text_color_black">@color/actionbar_text_color</color>
     <!-- Solid grey for status bar overlay-->
     <color name="actionbar_color_grey_solid">#777777</color>
 
     <!-- Text color of the search box text as entered by user  -->
-    <color name="searchbox_text_color">#000000</color>
+    <color name="searchbox_text_color">@color/e_primary_text_color</color>
     <!-- Background color of the search box -->
-    <color name="searchbox_background_color">#ffffff</color>
+    <color name="searchbox_background_color">@color/e_action_bar</color>
 
-    <color name="searchbox_hint_text_color">#66000000</color>
+    <color name="searchbox_hint_text_color">@color/e_disabled_color</color>
 
     <color name="search_shortcut_icon_color">@color/dialtacts_theme_color</color>
 
     <!-- Color of the background of the contact detail and editor pages -->
-    <color name="background_primary">#f9f9f9</color>
+    <color name="background_primary">@color/e_background</color>
     <color name="contact_all_list_background_color">#FFFFFF</color>
 
     <!-- Text color used for character counter when the max limit has been exceeded -->
@@ -233,7 +229,7 @@
     <color name="account_filter_text_color">@color/actionbar_text_color_black</color>
     <color name="custom_filter_divider">#dbdbdb</color>
 
-    <color name="material_star_pink">#f50057</color>
+    <color name="material_star_pink">@color/e_accent</color>
 
     <!-- Primary text color in Contacts app -->
     <color name="contacts_text_color">#333333</color>
@@ -245,13 +241,13 @@
     <color name="alert_background">#e0e0e0</color>
 
     <!-- Divider color in navigation drawer -->
-    <color name="drawer_divider_color">#E5E5E5</color>
+    <color name="drawer_divider_color">@android:color/transparent</color>
 
     <!-- Background color for the navigation drawer -->
-    <color name="navigation_drawer_background_color">#FAFAFA</color>
+    <color name="navigation_drawer_background_color">@color/e_drawer_background</color>
 
     <!-- Background color for the current selected item in the navigation drawer -->
-    <color name="drawer_selected_color">#E8E8E8</color>
+    <color name="drawer_selected_color">@color/navigation_drawer_item_background</color>
 
     <!-- Highlight color used in places such as ripples -->
     <color name="control_highlight_color">#1A000000</color>
diff --git a/res/values/lineage_colors.xml b/res/values/lineage_colors.xml
index 6aee4d227e..96b4c511d0 100644
--- a/res/values/lineage_colors.xml
+++ b/res/values/lineage_colors.xml
@@ -15,6 +15,6 @@
      limitations under the License.
 -->
 <resources>
-    <color name="navigation_bar_bg">@android:color/white</color>
-    <color name="navigation_bar_divider">#1f000000</color>
+    <color name="navigation_bar_bg">@color/e_action_bar</color>
+    <color name="navigation_bar_divider">@android:color/transparent</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 18401599ea..64b5af0a61 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -92,7 +92,7 @@
     <style name="LaunchScreenTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
-        <item name="colorPrimary">@color/primary_color</item>
+        <item name="colorPrimary">@color/e_accent</item>
     </style>
 
     <style name="PeopleActivityTheme" parent="@style/PeopleThemeAppCompat">
@@ -182,8 +182,8 @@
 
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">false</item>
-        <item name="color">@android:color/white</item>
-        <item name="android:color">@android:color/white</item>
+        <item name="color">@color/e_primary_text_color</item>
+        <item name="android:color">@color/e_primary_text_color</item>
     </style>
 
     <!-- Use the non-light style so that the up button & icons aren't black. If we use the
@@ -272,11 +272,14 @@
 
     <style name="ContactsPreferencesTheme" parent="@style/PeopleThemeAppCompat">
         <item name="android:listViewStyle">@style/ListViewStyle</item>
+        <item name="android:listDivider">@null</item>
+        <item name="android:divider">@null</item>
     </style>
 
     <style name="ContactListFilterTheme" parent="@style/PeopleTheme">
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="android:actionButtonStyle">@style/FilterActionButtonStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
     </style>
 
     <style name="NonPhoneActivityTheme" parent="@android:Theme.Translucent.NoTitleBar">
@@ -294,11 +297,11 @@
         <item name="android:textColorPrimary">@color/primary_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/e_accent</item>
     </style>
 
     <style name="SelectableItem" parent="@android:style/Theme.Material.Light">
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:background">@color/e_floating_background</item>
     </style>
 
     <style name="ExpandingEntryCardStyle">
@@ -337,12 +340,12 @@
     <!-- Inherit from Theme.Material.Light.Dialog instead of Theme.Material.Light.Dialog.Alert
         since the Alert dialog is private. They are identical anyway. -->
     <style name="ContactsAlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/e_accent</item>
     </style>
 
     <style name="ContactsAlertDialogThemeAppCompat" parent="Theme.AppCompat.Light.Dialog.MinWidth">
-        <item name="android:colorAccent">@color/primary_color</item>
-        <item name="colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/e_accent</item>
+        <item name="colorAccent">@color/e_accent</item>
     </style>
 
     <style name="EditKindIconStyle">
@@ -386,8 +389,7 @@
     <!-- Text style for empty states (no account view, empty label). -->
     <style name="EmptyStateTextStyle">
         <item name="android:textSize">18sp</item>
-        <item name="android:textColor">#000000</item>
-        <item name="android:alpha">0.54</item>
+        <item name="android:textColor">@color/e_primary_text_color</item>
         <item name="android:fontFamily">sans-serif</item>
     </style>
 
@@ -453,6 +455,8 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
 
     <style name="ListViewStyle" parent="@android:style/Widget.Material.Light.ListView">
         <item name="android:overScrollMode">always</item>
+        <item name="android:listDivider">@null</item>
+        <item name="android:divider">@null</item>
     </style>
 
     <!-- Adding padding to action button doesn't move it to left, we increase the button width to
@@ -568,12 +572,12 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
     </style>
 
     <style name="DrawerItemTextActiveStyle">
-        <item name="android:textColor">@color/primary_color</item>
+        <item name="android:textColor">@color/e_accent</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="DrawerItemTextInactiveStyle">
-        <item name="android:textColor">@color/quantum_black_text</item>
+        <item name="android:textColor">@color/e_icon_color</item>
         <item name="android:textStyle">bold</item>
     </style>
 
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 31007fc899..ecf513ef64 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1033,8 +1033,8 @@ public class PeopleActivity extends AppCompatContactsActivity implements
     // Reset toolbar and status bar color to Contacts theme color.
     private void resetToolBarStatusBarColor() {
         findViewById(R.id.toolbar_frame).setBackgroundColor(
-                ContextCompat.getColor(this, R.color.primary_color));
-        updateStatusBarBackground(ContextCompat.getColor(this, R.color.primary_color_dark));
+                ContextCompat.getColor(this, R.color.actionbar_background_color));
+        updateStatusBarBackground(ContextCompat.getColor(this, R.color.actionbar_background_color));
     }
 
     protected DefaultContactBrowseListFragment getListFragment() {
diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java
index f6898b54fa..5501faf113 100644
--- a/src/com/android/contacts/drawer/DrawerAdapter.java
+++ b/src/com/android/contacts/drawer/DrawerAdapter.java
@@ -398,7 +398,7 @@ public class DrawerAdapter extends BaseAdapter {
         textView.setTextAppearance(mActivity, activated
                 ? TYPEFACE_STYLE_ACTIVATE : TYPEFACE_STYLE_INACTIVE);
         if (activated) {
-            imageView.setColorFilter(mActivity.getResources().getColor(R.color.primary_color),
+            imageView.setColorFilter(mActivity.getResources().getColor(R.color.navigation_drawer_selector),
                     PorterDuff.Mode.SRC_ATOP);
         } else {
             imageView.clearColorFilter();
diff --git a/src/com/android/contacts/lettertiles/LetterTileDrawable.java b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
index b80fd4f76d..e5ef2ca378 100644
--- a/src/com/android/contacts/lettertiles/LetterTileDrawable.java
+++ b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
@@ -160,7 +160,6 @@ public class LetterTileDrawable extends Drawable {
             sPaint.getTextBounds(sFirstChar, 0, 1, sRect);
             sPaint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));
             sPaint.setColor(sTileFontColor);
-            sPaint.setAlpha(ALPHA);
 
             // Draw the letter in the canvas, vertically shifted up or down by the user-defined
             // offset
diff --git a/src/com/android/contacts/util/MaterialColorMapUtils.java b/src/com/android/contacts/util/MaterialColorMapUtils.java
index c1616cec7d..7182104545 100644
--- a/src/com/android/contacts/util/MaterialColorMapUtils.java
+++ b/src/com/android/contacts/util/MaterialColorMapUtils.java
@@ -199,7 +199,7 @@ public class MaterialColorMapUtils {
         final boolean isGroupView = activity instanceof PeopleActivity
                 && ((PeopleActivity) activity).isGroupView();
         return isGroupView
-                ? ContextCompat.getColor(activity, R.color.group_primary_color)
-                : ContextCompat.getColor(activity, R.color.primary_color);
+                ? ContextCompat.getColor(activity, R.color.actionbar_background_color)
+                : ContextCompat.getColor(activity, R.color.actionbar_background_color);
     }
 }
-- 
GitLab