From 91afb3796ddb1a0baef1e3ab29c6914a302be162 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Fri, 18 Dec 2020 14:43:31 +0000
Subject: [PATCH] Revert "Merge branch 'issue_1828' into 'v1-pie'"

This reverts merge request !35
---
 AndroidManifest.xml                           |  1 -
 res/drawable/fab_bg.xml                       | 12 ---
 res/drawable/ic_work_profile.xml              |  3 +-
 res/drawable/quantum_ic_add_vd_theme_24.xml   |  2 +-
 res/drawable/quantum_ic_close_vd_theme_24.xml |  2 +-
 res/drawable/quantum_ic_menu_vd_theme_24.xml  |  2 +-
 .../quantum_ic_search_vd_theme_24.xml         |  2 +-
 .../account_selector_list_item_condensed.xml  |  2 -
 res/layout/contact_editor_activity.xml        |  1 -
 res/layout/contact_list_filter_item.xml       |  1 -
 .../custom_contact_list_filter_group.xml      |  3 +-
 res/layout/date_picker.xml                    |  4 +-
 res/layout/default_account_checkbox.xml       |  1 -
 res/layout/floating_action_button.xml         |  4 +-
 res/layout/people_activity_toolbar.xml        |  4 +-
 res/layout/search_bar_expanded.xml            |  5 +-
 res/menu/edit_contact.xml                     |  3 -
 res/menu/people_options.xml                   |  5 +-
 res/menu/search_menu.xml                      |  5 +-
 res/values-v27/styles.xml                     |  8 --
 res/values/colors.xml                         | 20 ++---
 res/values/styles.xml                         | 80 +++++--------------
 res/xml/searchable.xml                        |  2 +-
 .../android/contacts/ContactsApplication.java | 12 ---
 .../contacts/activities/ActionBarAdapter.java |  4 +-
 .../activities/ContactEditorActivity.java     | 21 -----
 .../activities/ContactSelectionActivity.java  | 28 +------
 .../contacts/activities/LicenseActivity.java  | 16 ----
 .../contacts/activities/PeopleActivity.java   | 63 +++------------
 .../contacts/drawer/DrawerAdapter.java        |  1 -
 .../editor/ContactEditorFragment.java         |  4 -
 .../contacts/editor/EditorUiUtils.java        |  6 +-
 .../contacts/editor/TextFieldsEditorView.java | 10 ---
 .../ContactMultiDeletionInteraction.java      | 10 ---
 .../interactions/ImportDialogFragment.java    | 11 +--
 .../contacts/list/AccountFilterActivity.java  | 25 ------
 .../list/CustomContactListFilterActivity.java | 29 +------
 .../DefaultContactBrowseListFragment.java     | 11 +--
 .../list/GroupMemberPickerFragment.java       |  2 -
 .../ContactsPreferenceActivity.java           | 30 +------
 .../DisplayOptionsPreferenceFragment.java     |  3 -
 tests/res/layout/fill_call_log_test.xml       |  1 -
 42 files changed, 59 insertions(+), 400 deletions(-)
 delete mode 100644 res/drawable/fab_bg.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f91df2770e..98d7677463 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -71,7 +71,6 @@
         android:appCategory="social"
         android:supportsRtl="true"
         android:taskAffinity="android.task.contacts"
-
         android:usesCleartextTraffic="false">
         <!-- The main Contacts activity with the contact list, favorites, and groups. -->
         <activity
diff --git a/res/drawable/fab_bg.xml b/res/drawable/fab_bg.xml
deleted file mode 100644
index 9dfd9699b6..0000000000
--- a/res/drawable/fab_bg.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <solid
-        android:color="#ffffff"/>
-
-    <size
-        android:width="120dp"
-        android:height="120dp"/>
-</shape>
\ No newline at end of file
diff --git a/res/drawable/ic_work_profile.xml b/res/drawable/ic_work_profile.xml
index 47b2f9b3c4..d30e8e1c10 100644
--- a/res/drawable/ic_work_profile.xml
+++ b/res/drawable/ic_work_profile.xml
@@ -2,8 +2,7 @@
         android:width="16dp"
         android:height="16dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-    >
+        android:viewportHeight="24.0">
     <path
         android:pathData="M20,6h-4V4c0,-1.11 -0.89,-2 -2,-2h-4C8.89,2 8,2.89 8,4v2H4C2.89,6 2.01,6.89 2.01,8L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V8C22,6.89 21.11,6 20,6zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2s2,0.9 2,2S13.1,15 12,15zM14,6h-4V4h4V6z"
         android:fillColor="#7F7F7F"/>
diff --git a/res/drawable/quantum_ic_add_vd_theme_24.xml b/res/drawable/quantum_ic_add_vd_theme_24.xml
index 3ceffde2d9..167dafee63 100644
--- a/res/drawable/quantum_ic_add_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_add_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/color_default_blue1"
+        android:fillColor="@android:color/white"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_close_vd_theme_24.xml b/res/drawable/quantum_ic_close_vd_theme_24.xml
index 955f791248..0aafe4b5a1 100644
--- a/res/drawable/quantum_ic_close_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_close_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/color_default_blue1"
+        android:fillColor="@android:color/white"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_menu_vd_theme_24.xml b/res/drawable/quantum_ic_menu_vd_theme_24.xml
index fdb88f3b93..ba6adcbc42 100644
--- a/res/drawable/quantum_ic_menu_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_menu_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/color_default_blue1"
+        android:fillColor="@android:color/white"
         android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_search_vd_theme_24.xml b/res/drawable/quantum_ic_search_vd_theme_24.xml
index 6e9da640e2..5c5632a84b 100644
--- a/res/drawable/quantum_ic_search_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_search_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/color_default_blue1"
+        android:fillColor="@android:color/white"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
 </vector>
diff --git a/res/layout/account_selector_list_item_condensed.xml b/res/layout/account_selector_list_item_condensed.xml
index d43a3af37d..ae91726033 100644
--- a/res/layout/account_selector_list_item_condensed.xml
+++ b/res/layout/account_selector_list_item_condensed.xml
@@ -52,7 +52,5 @@
             android:textColor="?android:attr/textColorSecondary"
             android:singleLine="true"
             android:ellipsize="end"/>
-
-
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/contact_editor_activity.xml b/res/layout/contact_editor_activity.xml
index fc30c121f0..36fc64aa16 100644
--- a/res/layout/contact_editor_activity.xml
+++ b/res/layout/contact_editor_activity.xml
@@ -30,7 +30,6 @@
         android:background="?android:attr/colorPrimary"
         android:elevation="4dp"
         app:navigationContentDescription="@string/cancel_button_content_description"
-        app:theme="@style/ThemeOverlay.AppCompat.Light"
         app:navigationIcon="@drawable/quantum_ic_close_vd_theme_24"
         app:title="@string/contact_editor_title_existing_contact" />
 
diff --git a/res/layout/contact_list_filter_item.xml b/res/layout/contact_list_filter_item.xml
index 637b2246ab..4d1fbca70f 100644
--- a/res/layout/contact_list_filter_item.xml
+++ b/res/layout/contact_list_filter_item.xml
@@ -61,7 +61,6 @@
     </LinearLayout>
 
     <RadioButton
-        android:buttonTint="@color/color_default_blue1"
         android:id="@+id/radioButton"
         android:clickable="false"
         android:layout_width="wrap_content"
diff --git a/res/layout/custom_contact_list_filter_group.xml b/res/layout/custom_contact_list_filter_group.xml
index 9fb473ae3d..c67ce163c8 100644
--- a/res/layout/custom_contact_list_filter_group.xml
+++ b/res/layout/custom_contact_list_filter_group.xml
@@ -77,8 +77,7 @@
             android:gravity="center_vertical"
             android:orientation="vertical"
             android:duplicateParentState="true"
-            android:buttonTint="@color/color_default_blue1"
-            />
+        />
 
     </LinearLayout>
 
diff --git a/res/layout/date_picker.xml b/res/layout/date_picker.xml
index 9bfb8de996..c700f9e643 100644
--- a/res/layout/date_picker.xml
+++ b/res/layout/date_picker.xml
@@ -36,9 +36,7 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:layout_gravity="center_horizontal"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:buttonTint="@color/color_default_blue1"
-        />
+        android:layout_height="wrap_content"/>
     <!-- Warning: everything within the parent is removed and re-ordered depending
          on the date format selected by the user. -->
     <LinearLayout
diff --git a/res/layout/default_account_checkbox.xml b/res/layout/default_account_checkbox.xml
index 635f90e504..9a1a450407 100644
--- a/res/layout/default_account_checkbox.xml
+++ b/res/layout/default_account_checkbox.xml
@@ -32,6 +32,5 @@
         android:textAlignment="viewStart"
         android:text="@string/set_default_account"
         android:textColor="@color/dialtacts_secondary_text_color"
-        android:buttonTint="@color/color_default_blue1"
         />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/floating_action_button.xml b/res/layout/floating_action_button.xml
index 9dcf9f64fa..a31512f19f 100644
--- a/res/layout/floating_action_button.xml
+++ b/res/layout/floating_action_button.xml
@@ -26,7 +26,7 @@
     android:layout_gravity="bottom|end"
     android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
     android:layout_marginEnd="@dimen/floating_action_button_margin_right"
-    android:background="@drawable/fab_bg"
+    android:background="@drawable/fab_pink"
     android:elevation="@dimen/design_fab_elevation"
     app:layout_dodgeInsetEdges="bottom" >
 
@@ -37,5 +37,5 @@
         android:background="@drawable/floating_action_button"
         android:contentDescription="@string/action_menu_add_new_contact_button"
         android:src="@drawable/quantum_ic_add_vd_theme_24"
-        android:tint="@color/color_default_blue1" />
+        android:tint="@color/floating_action_button_icon_color"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/people_activity_toolbar.xml b/res/layout/people_activity_toolbar.xml
index 89f10e7d2d..3599f0c607 100644
--- a/res/layout/people_activity_toolbar.xml
+++ b/res/layout/people_activity_toolbar.xml
@@ -33,9 +33,7 @@
             android:layout_height="?attr/actionBarSize"
             android:id="@+id/toolbar"
             android:padding="0dp"
-            style="@style/ContactsToolbarStyle"
-             />
+            style="@style/ContactsToolbarStyle" />
 
-        <!---->
     </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/search_bar_expanded.xml b/res/layout/search_bar_expanded.xml
index 58294a3b3c..9f90bc7d09 100644
--- a/res/layout/search_bar_expanded.xml
+++ b/res/layout/search_bar_expanded.xml
@@ -28,10 +28,9 @@
         android:layout_height="@dimen/search_box_icon_size"
         android:layout_marginEnd="@dimen/search_box_navigation_icon_margin"
         android:src="@drawable/quantum_ic_arrow_back_vd_theme_24"
-        android:tint="@color/color_default_blue1"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_menu_back_from_search"
-         />
+        android:tint="@color/actionbar_background_color" />
 
     <android.widget.AutoCompleteTextView
         android:id="@+id/search_view"
@@ -55,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/color_default_blue1"
+        android:tint="@color/quantum_black_secondary_text"
         android:clickable="true"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/description_clear_search" />
diff --git a/res/menu/edit_contact.xml b/res/menu/edit_contact.xml
index b30934e67c..039c6570eb 100644
--- a/res/menu/edit_contact.xml
+++ b/res/menu/edit_contact.xml
@@ -17,15 +17,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        app:itemTextColor="@color/color_default_blue1"
-        app:itemIconTint="@color/color_default_blue1"
         android:id="@+id/menu_save"
         app:showAsAction="always"
         app:actionLayout="@layout/editor_save_button"
         android:title="@string/menu_save" />
 
     <item
-
         android:id="@+id/menu_split"
         android:title="@string/menu_splitAggregate" />
 
diff --git a/res/menu/people_options.xml b/res/menu/people_options.xml
index 86be2d61c2..5fb0f2eb62 100644
--- a/res/menu/people_options.xml
+++ b/res/menu/people_options.xml
@@ -14,14 +14,11 @@
      limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:contacts="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/tools">
+      xmlns:contacts="http://schemas.android.com/apk/res-auto">
     <item
-        app:itemIconTint="@color/color_default_blue1"
         android:id="@+id/menu_search"
         android:icon="@drawable/quantum_ic_search_vd_theme_24"
         android:title="@string/hint_findContacts"
-        app:iconTint="@color/color_default_blue1"
         contacts:showAsAction="ifRoom" />
 
     <item
diff --git a/res/menu/search_menu.xml b/res/menu/search_menu.xml
index c715c16ad4..bf4b5ddc43 100644
--- a/res/menu/search_menu.xml
+++ b/res/menu/search_menu.xml
@@ -14,12 +14,9 @@
      limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:contacts="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/tools">
+    xmlns:contacts="http://schemas.android.com/apk/res-auto">
     <item
-        app:itemIconTint="@color/color_default_blue1"
         android:id="@+id/menu_search"
-        app:iconTint="@color/color_default_blue1"
         android:icon="@drawable/quantum_ic_search_vd_theme_24"
         android:title="@string/hint_findContacts"
         contacts:showAsAction="always" />
diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml
index 3cd5eaf678..ca71d406fd 100644
--- a/res/values-v27/styles.xml
+++ b/res/values-v27/styles.xml
@@ -61,13 +61,6 @@
         <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="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
-    </style>
-
-    <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">@color/color_default_blue1</item>
     </style>
 
     <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -83,7 +76,6 @@
         <item name="android:actionModeCloseDrawable">@drawable/quantum_ic_close_vd_theme_24</item>
         <item name="android:textColorPrimary">@color/primary_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
-        <!--<item name="android:icon">@android:color/transparent</item>-->
         <item name="android:icon">@android:color/transparent</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="android:windowBackground">@color/background_primary</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 67c37e2a52..e25af79a08 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,8 +32,7 @@
 
     <color name="nav_item_selected_background">#0f000000</color>
 
-    <color name="action_bar_button_text_color">@color/color_default_blue1</color>
-    <color name="action_bar_button_menu_color">#ffffff</color>
+    <color name="action_bar_button_text_color">#FFFFFF</color>
 
     <color name="actionbar_background_color">@color/primary_color</color>
 
@@ -43,21 +42,14 @@
 
  <!--   <color name="primary_color_dark">#1c3aa9</color>
     <color name="primary_color">#2a56c6</color>-->
- <color name="primary_color_dark">@lineageos.platform:color/color_default_foreground</color>
-    <color name="primary_color">@lineageos.platform:color/color_default_foreground</color>
+ <color name="primary_color_dark">@lineageos.platform:color/color_default_primary</color>
+    <color name="primary_color">@lineageos.platform:color/color_default_primary_dark</color>
 
     <color name="group_primary_color_dark">#546E7A</color>
     <color name="group_primary_color">#607D8B</color>
     <color name="accent">@lineageos.platform:color/color_default_accent</color>
-
-    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
-    <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
-    <color name="color_default_background">@lineageos.platform:color/color_default_background</color>
-    <color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</color>
-    <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
-
     <!-- Color of the selected tab underline -->
-    <color name="contacts_accent_color">@lineageos.platform:color/color_default_accent</color>
+    <color name="contacts_accent_color">#FFFFFF</color>
 
     <color name="floating_action_button_icon_color">@color/contacts_accent_color</color>
 
@@ -112,7 +104,7 @@
     <color name="secondary_text_color">@color/dialtacts_secondary_text_color</color>
 
     <!-- Text color for section header. -->
-    <color name="section_header_text_color">#A1A1A1</color>
+    <color name="section_header_text_color">@color/dialtacts_theme_color</color>
 
     <!-- Color of the theme of the People app -->
     <color name="people_app_theme_color">#363636</color>
@@ -266,5 +258,5 @@
     <!-- Highlight color used in places such as ripples -->
     <color name="control_highlight_color">#1A000000</color>
 
-    <color name="black">#000000</color>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ea3386efa3..dc45bcb61b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,19 +20,7 @@
         <item name="actionBarStyle">@style/EditorActionBarStyle</item>
         <item name="colorButtonNormal">@color/background_primary</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
-        <item name="android:editTextStyle">@style/myEditText</item>
     </style>
-    <style name="myEditText" parent="@android:style/Widget.Holo.Light.EditText">
-        <item name="android:textCursorDrawable">@color/color_default_blue1</item>
-        <item name="android:colorControlNormal">@color/color_default_secondary_text</item>
-        <item name="colorControlNormal">@color/color_default_secondary_text</item>
-        <item name="android:colorControlActivated">@color/color_default_blue1</item>
-        <item name="colorControlActivated">@color/color_default_blue1</item>
-        <item name="android:colorControlHighlight">@color/color_default_blue1</item>
-        <item name="colorControlHighlight">@color/color_default_blue1</item>
-    </style>
-
 
     <style name="Theme.QuickContact" parent="@style/PeopleTheme">
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -44,7 +32,6 @@
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
         <!-- We need to use a light ripple behind ActionBar items in order for them to
              be visible when using some of the darker ActionBar tints -->
         <item name="android:actionBarItemBackground">
@@ -53,23 +40,18 @@
     </style>
 
     <style name="PeopleTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
-        <item name="android:navigationBarColor">@android:color/black</item>
-
         <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
         <!-- Style for the overflow button in the actionbar. -->
         <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>
         <item name="android:actionModeCloseDrawable">@drawable/quantum_ic_close_vd_theme_24</item>
         <item name="android:textColorPrimary">@color/primary_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
-        <item name="toolbarNavigationButtonStyle">@style/ContactToolbarNavigationButtonStyle</item>
         <item name="android:icon">@android:color/transparent</item>
         <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:windowLightStatusBar" tools:targetApi="27">true</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
         <item name="android:colorPrimary">@color/primary_color</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/primary_color</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>
@@ -111,14 +93,7 @@
         <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>
         <!-- Ensure the status bar color matches the background (grey 500) -->
         <!-- TODO(yaolu): Switch to use quantum_grey if in Google3 -->
-        <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
-        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
-        <item name="android:navigationBarColor">@android:color/black</item>
-
-    </style>
-
-    <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">@color/color_default_blue1</item>
+        <item name="android:colorPrimaryDark">#9e9e9e</item>
     </style>
 
     <style name="PeopleActivityTheme" parent="@style/PeopleThemeAppCompat">
@@ -127,9 +102,7 @@
         <item name="android:listSelector">?android:attr/listChoiceBackgroundIndicator</item>
     </style>
 
-    <style name="PeopleThemeAppCompat" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="android:navigationBarColor">@android:color/black</item>
-        <!--Theme.AppCompat.Light.DarkActionBar-->
+    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Styles that require AppCompat compatibility, remember to update both sets -->
         <item name="android:actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>
         <item name="actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>
@@ -146,13 +119,11 @@
         <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:windowLightStatusBar" tools:targetApi="27">true</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</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="colorAccent">@color/color_default_blue1</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="colorAccent">@color/primary_color</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
         <item name="alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
         <item name="list_item_height">@dimen/contact_browser_list_item_height</item>
@@ -211,8 +182,8 @@
 
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">false</item>
-        <item name="color">@color/color_default_blue1</item>
-        <item name="android:color">@color/color_default_blue1</item>
+        <item name="color">@android:color/white</item>
+        <item name="android:color">@android:color/white</item>
     </style>
 
     <!-- Use the non-light style so that the up button & icons aren't black. If we use the
@@ -243,20 +214,14 @@
         <item name="android:contentInsetStart">72dp</item>
         <item name="android:contentInsetStartWithNavigation">72dp</item>
         <item name="android:titleTextAppearance">@style/ContactsActionBarTitleText</item>
-        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
-
     </style>
 
-
     <!-- When this style was added, android:toolbarStyle was private. Therefore, this style
          must be directly applied to every toolbar -->
     <style name="ContactsToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
         <!-- Styles that require AppCompat compatibility, remember to update both sets -->
         <item name="android:titleTextAppearance">@style/ContactsActionBarTitleTextAppCompat</item>
         <item name="titleTextAppearance">@style/ContactsActionBarTitleTextAppCompat</item>
-        <!--<item name="android:textColorSecondary">@color/color_default_primary_text</item>-->
-        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
-        <item name="android:tint">@color/color_default_blue1</item>
     </style>
 
     <style name="LightToolbarNavigationButtonStyle" parent="@style/Widget.AppCompat.Toolbar.Button.Navigation">
@@ -278,28 +243,28 @@
     <style name="ContactsActionBarTitleText"
         parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
         <item name="android:textSize">20dp</item>
-        <item name="android:textColor">@color/color_default_blue1</item>
+        <item name="android:textColor">@color/actionbar_text_color</item>
     </style>
 
     <style name="ContactsActionBarTitleTextAppCompat" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
         <item name="android:textSize">20dp</item>
-        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="android:textColor">@color/actionbar_text_color</item>
     </style>
 
     <style name="ContactsActionBarTitleTextBlack" parent="@style/ContactsActionBarTitleTextAppCompat">
-        <item name="android:textColor">@color/color_default_blue1</item>
+        <item name="android:textColor">@color/actionbar_text_color_black</item>
     </style>
 
     <!-- Action bar overflow menu icon. -->
     <style name="ContactsActionBarOverflowQP"
         parent="Widget.AppCompat.Light.ActionButton.Overflow">
         <item name="android:src">@drawable/quantum_ic_more_vert_vd_theme_24</item>
-        <item name="android:tint">@color/action_bar_button_menu_color</item>
+        <item name="android:tint">@color/action_bar_button_text_color</item>
     </style>
 
     <!-- Toolbar navigation button. -->
     <style name="ContactToolbarNavigationButtonStyle" parent="@style/Widget.AppCompat.Toolbar.Button.Navigation">
-        <item name="android:tint">@color/color_default_blue1</item>
+        <item name="android:tint">@color/action_bar_button_text_color</item>
     </style>
 
     <style name="ContactPickerTheme" parent="PeopleActivityTheme">
@@ -307,16 +272,11 @@
 
     <style name="ContactsPreferencesTheme" parent="@style/PeopleThemeAppCompat">
         <item name="android:listViewStyle">@style/ListViewStyle</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:colorControlNormal">@color/color_default_blue1</item>
-        <item name="android:textColorSecondary">@color/color_default_blue1</item>
-
     </style>
 
     <style name="NonPhoneActivityTheme" parent="@android:Theme.Translucent.NoTitleBar">
@@ -334,7 +294,7 @@
         <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/color_default_blue1</item>
+        <item name="android:colorAccent">@color/primary_color</item>
     </style>
 
     <style name="SelectableItem" parent="@android:style/Theme.Material.Light">
@@ -377,13 +337,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/color_default_blue1</item>
-
+        <item name="android:colorAccent">@color/primary_color</item>
     </style>
 
     <style name="ContactsAlertDialogThemeAppCompat" parent="Theme.AppCompat.Light.Dialog.MinWidth">
-        <item name="android:colorAccent">@color/color_default_blue1</item>
-        <item name="colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="colorAccent">@color/primary_color</item>
     </style>
 
     <style name="EditKindIconStyle">
@@ -435,7 +394,7 @@
     <!-- Button style for main contacts no account empty view. -->
     <style name="NoAccountViewButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/color_default_blue1</item>
+        <item name="android:textColor">@color/primary_color</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textAllCaps">true</item>
     </style>
@@ -443,7 +402,7 @@
     <!-- Add contacts button style for empty states. -->
     <style name="AddContactsButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/color_default_blue1</item>
+        <item name="android:textColor">@color/primary_color</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textAllCaps">true</item>
     </style>
@@ -500,8 +459,7 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
      make margin between the button and screen edge 16dp -->
     <style name="FilterActionButtonStyle" parent="@android:Widget.ActionButton">
         <item name="android:minWidth">@dimen/contact_filter_action_button_width</item>
-        <item name="android:textColor">@color/color_default_blue1</item>
-
+        <item name="android:textColor">@color/actionbar_text_color</item>
     </style>
 
     <style name="CustomContactListFilterView" parent="ContactListFilterTheme">
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index bfa403f76e..3d6876ebcd 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -17,7 +17,7 @@
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
     android:label="@string/contactsList"
     android:hint="@string/searchHint"
-       android:searchMode="queryRewriteFromText"
+    android:searchMode="queryRewriteFromText"
 
     android:includeInGlobalSearch="true"
     android:queryAfterZeroResults="true"
diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index dc47172060..1507ace31d 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -16,17 +16,14 @@
 
 package com.android.contacts;
 
-import android.app.Activity;
 import android.app.Application;
 import android.app.FragmentManager;
 import android.app.LoaderManager;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.Context;
-import android.content.ContextWrapper;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.StrictMode;
 import android.preference.PreferenceManager;
 import android.provider.ContactsContract.Contacts;
@@ -121,16 +118,7 @@ public class ContactsApplication extends Application {
         }
 
         AnalyticsUtil.initialize(this);
-
-
-
     }
-    public void setNavBarColor(int Color, Activity activity) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            activity.getWindow().setNavigationBarColor(Color);
-        }
-    }
-
 
     private class DelayedInitializer extends AsyncTask<Void, Void, Void> {
         @Override
diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index af5d9f29ec..27bcc7a351 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -155,7 +155,6 @@ public class ActionBarAdapter implements OnCloseListener {
         mSearchView.addTextChangedListener(new SearchTextWatcher());
         final ImageButton searchBackButton = (ImageButton) mSearchContainer
                 .findViewById(R.id.search_back_button);
-
         searchBackButton.setOnClickListener(
                 new OnClickListener() {
             @Override
@@ -337,7 +336,6 @@ public class ActionBarAdapter implements OnCloseListener {
             mToolbar.setContentInsetsRelative(mMaxToolbarContentInsetStart,
                     mToolbar.getContentInsetEnd());
             mToolbar.setNavigationIcon(R.drawable.quantum_ic_menu_vd_theme_24);
-
         } else {
             mToolbar.setNavigationIcon(null);
         }
@@ -468,7 +466,7 @@ public class ActionBarAdapter implements OnCloseListener {
                                         R.color.actionbar_color_grey_solid);
                             } else {
                                 iconColor = mActivity.getResources().getColor(
-                                        R.color.color_default_blue1);
+                                        R.color.actionbar_text_color);
                             }
                             overflow.setImageTintList(ColorStateList.valueOf(iconColor));
                         }
diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index 299f2470fb..ec49d48b56 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -21,17 +21,12 @@ import android.app.FragmentTransaction;
 import android.content.ComponentName;
 import android.content.ContentValues;
 import android.content.Intent;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.provider.ContactsContract.QuickContact;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
-import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 
 import com.android.contacts.AppCompatContactsActivity;
@@ -50,9 +45,6 @@ import com.android.contacts.util.ImplicitIntentsUtil;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
 
-import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
-
 /**
  * Contact editor with only the most important fields displayed initially.
  */
@@ -360,7 +352,6 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements
             mActionBarTitleResId = R.string.contact_editor_title_new_contact;
         }
         mToolbar.setTitle(mActionBarTitleResId);
-        mToolbar.setTitleTextColor(getResources().getColor(R.color.color_default_blue1));
         // Set activity title for Talkback
         setTitle(mActionBarTitleResId);
 
@@ -394,18 +385,6 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements
         if (Intent.ACTION_INSERT.equals(action)) {
             DynamicShortcuts.reportShortcutUsed(this, DynamicShortcuts.SHORTCUT_ADD_CONTACT);
         }
-
-        //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        //this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-        //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
-
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-
-
     }
 
     @Override
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index 9e92830f04..eaa89a1ea0 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -22,7 +22,6 @@ import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.provider.ContactsContract.Contacts;
 import android.support.v4.content.ContextCompat;
@@ -35,8 +34,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
-import android.view.WindowManager;
-import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -69,9 +66,6 @@ import com.android.contacts.util.ViewUtil;
 
 import java.util.ArrayList;
 
-import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
-
 /**
  * Displays a list of contacts (or phone numbers or postal addresses) for the
  * purposes of selecting one.
@@ -137,18 +131,6 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
 
         prepareSearchViewAndActionBar(savedState);
         configureActivityTitle();
-
-        //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-
-        //this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-        //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
-
     }
 
     public boolean isSelectionMode() {
@@ -179,12 +161,8 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
                 && mRequest.getActionCode() != ContactsRequest.ACTION_PICK_PHONES
                 && !mRequest.isLegacyCompatibilityMode();
         configureSearchMode();
-
-
     }
 
-
-
     private void configureSearchMode() {
         mActionBarAdapter.setSearchMode(mIsSearchMode);
         invalidateOptionsMenu();
@@ -707,15 +685,11 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
         final MenuItem searchItem = menu.findItem(R.id.menu_search);
         searchItem.setVisible(!mIsSearchMode && mIsSearchSupported);
 
-
         final Drawable searchIcon = searchItem.getIcon();
         if (searchIcon != null) {
-
             searchIcon.mutate().setColorFilter(ContextCompat.getColor(this,
-                    R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP);
-
+                    R.color.actionbar_icon_color), PorterDuff.Mode.SRC_ATOP);
         }
-
         return true;
     }
 
diff --git a/src/com/android/contacts/activities/LicenseActivity.java b/src/com/android/contacts/activities/LicenseActivity.java
index be7ece18ec..4ccaa93f6b 100644
--- a/src/com/android/contacts/activities/LicenseActivity.java
+++ b/src/com/android/contacts/activities/LicenseActivity.java
@@ -15,20 +15,14 @@
  */
 package com.android.contacts.activities;
 
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager;
 import android.webkit.WebView;
 
 import com.android.contacts.R;
 
-import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
-
 /**
  * Displays the licenses for all open source libraries.
  */
@@ -46,16 +40,6 @@ public class LicenseActivity extends AppCompatActivity {
         if (actionBar != null) {
             actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
         }
-        //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-
-        // this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-        //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
-
     }
 
     @Override
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 1f30d14ae1..92eb5be071 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -30,9 +30,7 @@ import android.content.SyncStatusObserver;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.graphics.Color;
-import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -112,9 +110,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
-
 /**
  * Displays a list to browse contacts.
  */
@@ -199,9 +194,6 @@ public class PeopleActivity extends AppCompatContactsActivity implements
     private ContactsActionBarDrawerToggle mToggle;
     private Toolbar mToolbar;
 
-    public static int color_default_blue1;
-    public static int color_default_primary_text;
-
     // The account the new group will be created under.
     private AccountWithDataSet mNewGroupAccount;
 
@@ -395,9 +387,6 @@ public class PeopleActivity extends AppCompatContactsActivity implements
                 R.string.navigation_drawer_open, R.string.navigation_drawer_close);
         mDrawerLayout.setDrawerListener(mToggle);
         // Set fallback handler for when drawer is disabled.
-
-        mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.color_default_blue1));
-
         mToggle.setToolbarNavigationClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -433,12 +422,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements
         }
         getWindow().setBackgroundDrawable(null);
 
-
-
-        getSupportActionBar().setHomeAsUpIndicator(changeBackArrowColor(this, Color.rgb(50, 50, 50)));
-        getSupportActionBar().getThemedContext();
         ACCENT_COLOR=fetchAccentColor();
-
     }
 
     @Override
@@ -656,9 +640,6 @@ public class PeopleActivity extends AppCompatContactsActivity implements
         mSaveServiceListener = new SaveServiceListener();
         LocalBroadcastManager.getInstance(this).registerReceiver(mSaveServiceListener,
                 new IntentFilter(ContactSaveService.BROADCAST_GROUP_DELETED));
-
-        mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.color_default_blue1));
-
     }
 
     public void updateStatusBarBackground() {
@@ -1259,7 +1240,8 @@ public class PeopleActivity extends AppCompatContactsActivity implements
      */
     @Override
     public void onEmergencyViewSelected() {
-        ImplicitIntentsUtil.startActivityOutsideApp(this, ImplicitIntentsUtil.getIntentForEmergencyInfo(this));
+        ImplicitIntentsUtil.startActivityOutsideApp(this,
+                ImplicitIntentsUtil.getIntentForEmergencyInfo(this));
     }
 
     public boolean isGroupView() {
@@ -1319,48 +1301,23 @@ public class PeopleActivity extends AppCompatContactsActivity implements
         return intent;
     }
 
-
-
-    /*›
+    /*
      * get Accent color from OS
      * */
 
     private int fetchAccentColor() {
-
-        //SYSTEM_UI_FLAG_LIGHT_STATUS_BAR and SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
-        //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        //this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-
-
         int color=getResources().getColor(R.color.accent);
+//        TypedValue typedValue = new TypedValue();
+//        TypedArray a = this.obtainStyledAttributes(typedValue.data, new int[] { R.attr.colorAccent });
+//        int color = a.getColor(0, 0);
+//        a.recycle();
+//        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color));
+//        getSupportActionBar().setBackgroundDrawable(
+//                new ColorDrawable(color));
 
-        color_default_primary_text=getResources().getColor(R.color.color_default_primary_text);
-        color_default_blue1=getResources().getColor(R.color.color_default_blue1);
-        //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color_accent));
-        getSupportActionBar().getThemedContext();
 
-        mToolbar.setTitleTextColor(color_default_primary_text);
         return color;
     }
 
-    public static Drawable changeBackArrowColor(Context context, int color) {
-        String resName;
-        int res;
-
-        resName = Build.VERSION.SDK_INT >= 23 ? "abc_ic_ab_back_material" : "abc_ic_ab_back_mtrl_am_alpha";
-        res = context.getResources().getIdentifier(resName, "drawable", context.getPackageName());
-
-        final Drawable upArrow = context.getResources().getDrawable(res);
-        upArrow.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
-
-        return upArrow;
-    }
-
 
 }
diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java
index b8516592a4..0988eabdcd 100644
--- a/src/com/android/contacts/drawer/DrawerAdapter.java
+++ b/src/com/android/contacts/drawer/DrawerAdapter.java
@@ -378,7 +378,6 @@ public class DrawerAdapter extends BaseAdapter {
         result.setActivated(activated);
         result.setContentDescription(
                 displayableAccount.getTypeLabel() + " " + item.account.accountName);
-        updateSelectedStatus(textView, icon, activated);
         return result;
     }
 
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 6f8655f22f..2abd509771 100755
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -29,8 +29,6 @@ import android.content.Intent;
 import android.content.Loader;
 import android.database.Cursor;
 import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -722,8 +720,6 @@ public class ContactEditorFragment extends Fragment implements
     @Override
     public void onCreateOptionsMenu(Menu menu, final MenuInflater inflater) {
         inflater.inflate(R.menu.edit_contact, menu);
-
-
     }
 
     @Override
diff --git a/src/com/android/contacts/editor/EditorUiUtils.java b/src/com/android/contacts/editor/EditorUiUtils.java
index 7f221cd6ad..9aa5c8e16a 100644
--- a/src/com/android/contacts/editor/EditorUiUtils.java
+++ b/src/com/android/contacts/editor/EditorUiUtils.java
@@ -157,7 +157,7 @@ public class EditorUiUtils {
         switch (mimeType) {
             case StructuredName.CONTENT_ITEM_TYPE:
                 return ResourcesCompat.getDrawable(context.getResources(),
-                        lineageos.platform.R.drawable.ic_people, null);
+                        R.drawable.quantum_ic_person_vd_theme_24, null);
             case StructuredPostal.CONTENT_ITEM_TYPE:
                 return ResourcesCompat.getDrawable(context.getResources(),
                         R.drawable.quantum_ic_place_vd_theme_24, null);
@@ -166,10 +166,10 @@ public class EditorUiUtils {
                         R.drawable.quantum_ic_dialer_sip_vd_theme_24, null);
             case Phone.CONTENT_ITEM_TYPE:
                 return ResourcesCompat.getDrawable(context.getResources(),
-                        lineageos.platform.R.drawable.ic_phone, null);
+                        R.drawable.quantum_ic_phone_vd_theme_24, null);
             case Im.CONTENT_ITEM_TYPE:
                 return ResourcesCompat.getDrawable(context.getResources(),
-                        lineageos.platform.R.drawable.ic_message, null);
+                        R.drawable.quantum_ic_message_vd_theme_24, null);
             case Event.CONTENT_ITEM_TYPE:
                 return ResourcesCompat.getDrawable(context.getResources(),
                         R.drawable.quantum_ic_event_vd_theme_24, null);
diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index 957ae1bc3f..28fe87fc6e 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -29,8 +29,6 @@ import android.text.Spannable;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.text.style.CharacterStyle;
-import android.text.style.MetricAffectingSpan;
 import android.text.style.TtsSpan;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -346,14 +344,6 @@ public class TextFieldsEditorView extends LabeledEditorView {
                         mFixedPhonetic = getPhonetic(column);
                         mFixedDisplayName = displayNameField;
                     }
-
-                    CharacterStyle[] toBeRemovedSpans = s.getSpans(0, s.length(),
-                            MetricAffectingSpan.class);
-                    for (int index = 0; index < toBeRemovedSpans.length; index++)
-                        s.removeSpan(toBeRemovedSpans[index]);
-
-                    Log.e("TAG", "line 356 ....afterTextChanged...................removeSpan");
-
                 }
 
                 @Override
diff --git a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
index 0ae239ee3b..47b76a5399 100644
--- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
@@ -31,7 +31,6 @@ import android.os.Bundle;
 import android.provider.ContactsContract.RawContacts;
 import android.text.TextUtils;
 import android.util.Log;
-import android.widget.Button;
 
 import com.android.contacts.ContactSaveService;
 import com.android.contacts.R;
@@ -292,15 +291,6 @@ public class ContactMultiDeletionInteraction extends Fragment
                 mDialog = null;
             }
         });
-
-        mDialog.setOnShowListener( new DialogInterface.OnShowListener() {
-            @Override
-            public void onShow(DialogInterface arg0) {
-                mDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.color_default_blue1));
-                mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.color_default_blue1));
-            }
-        });
-
         mDialog.show();
     }
 
diff --git a/src/com/android/contacts/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java
index f45d64ee5b..5d27086da3 100644
--- a/src/com/android/contacts/interactions/ImportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ImportDialogFragment.java
@@ -216,17 +216,8 @@ public class ImportDialogFragment extends DialogFragment {
         } else {
             builder.setSingleChoiceItems(adapter, -1, clickListener);
         }
-        AlertDialog dialog=builder.create();
-        dialog.setOnShowListener( new DialogInterface.OnShowListener() {
-            @Override
-            public void onShow(DialogInterface arg0) {
-                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.color_default_blue1));
-                //dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.color_default_blue1));
-            }
-        });
-
 
-        return dialog;
+        return builder.create();
     }
 
     private int getSimContactCount(SimCard sim) {
diff --git a/src/com/android/contacts/list/AccountFilterActivity.java b/src/com/android/contacts/list/AccountFilterActivity.java
index 4517c513c4..6559489fd6 100644
--- a/src/com/android/contacts/list/AccountFilterActivity.java
+++ b/src/com/android/contacts/list/AccountFilterActivity.java
@@ -20,16 +20,11 @@ import android.app.ActionBar;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
@@ -40,9 +35,6 @@ import com.android.contacts.model.AccountTypeManager;
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
-
 /**
  * Shows a list of all available accounts, letting the user select under which account to view
  * contacts.
@@ -73,13 +65,6 @@ public class AccountFilterActivity extends Activity implements AdapterView.OnIte
 
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
-
-            String resName = Build.VERSION.SDK_INT >= 23 ? "abc_ic_ab_back_material" : "abc_ic_ab_back_mtrl_am_alpha";
-            int resINT = getResources().getIdentifier(resName, "drawable", getPackageName());
-
-            final Drawable upArrow = getResources().getDrawable(resINT);
-            upArrow.setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP);
-            actionBar.setHomeAsUpIndicator(upArrow);
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
@@ -95,16 +80,6 @@ public class AccountFilterActivity extends Activity implements AdapterView.OnIte
         filters.add(ContactListFilter.createFilterWithType(
                 ContactListFilter.FILTER_TYPE_CUSTOM));
         mListView.setAdapter(new FilterListAdapter(this, filters, mCurrentFilterType));
-        //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-
-        // this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-        //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
-
     }
 
     @Override
diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index cb0317309a..aa06eb3740 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -34,11 +34,8 @@ import android.content.Loader;
 import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.graphics.Color;
-import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.provider.ContactsContract;
@@ -52,7 +49,6 @@ import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.CheckBox;
 import android.widget.ExpandableListAdapter;
@@ -84,8 +80,6 @@ import java.util.List;
 
 import javax.annotation.Nullable;
 
-import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
 import static com.android.contacts.activities.PeopleActivity.ACCENT_COLOR;
 
 /**
@@ -136,29 +130,8 @@ public class CustomContactListFilterActivity extends Activity implements
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
             // android.R.id.home will be triggered in onOptionsItemSelected()
-
-            if (actionBar != null) {
-
-                String resName = Build.VERSION.SDK_INT >= 23 ? "abc_ic_ab_back_material" : "abc_ic_ab_back_mtrl_am_alpha";
-                int resINT = getResources().getIdentifier(resName, "drawable", getPackageName());
-
-                final Drawable upArrow = getResources().getDrawable(resINT);
-                upArrow.setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP);
-                actionBar.setHomeAsUpIndicator(upArrow);
-                actionBar.setDisplayHomeAsUpEnabled(true);
-            }
-
-        }
-      //  this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+            actionBar.setDisplayHomeAsUpEnabled(true);
         }
-
-        // this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-        //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
-
     }
 
     public static class CustomFilterConfigurationLoader extends ListenableFutureLoader<AccountSet> {
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 1c873bb642..f07c4a5a59 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -998,15 +998,6 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment
         }
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.people_options, menu);
-
-        final MenuItem searchItem = menu.findItem(R.id.menu_search);
-        final Drawable searchIcon = searchItem.getIcon();
-        if (searchIcon != null) {
-
-            searchIcon.mutate().setColorFilter(ContextCompat.getColor(mActivity,
-                    R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP);
-
-        }
     }
 
     @Override
@@ -1037,7 +1028,7 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment
             final Drawable icon = menu.getItem(i).getIcon();
             if (icon != null && !isSearchOrSelectionMode) {
                 icon.mutate().setColorFilter(ContextCompat.getColor(getContext(),
-                        R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP);
+                        R.color.actionbar_icon_color), PorterDuff.Mode.SRC_ATOP);
             }
         }
     }
diff --git a/src/com/android/contacts/list/GroupMemberPickerFragment.java b/src/com/android/contacts/list/GroupMemberPickerFragment.java
index 4567827d04..e94d73b1c4 100644
--- a/src/com/android/contacts/list/GroupMemberPickerFragment.java
+++ b/src/com/android/contacts/list/GroupMemberPickerFragment.java
@@ -270,8 +270,6 @@ public class GroupMemberPickerFragment extends
     public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
         super.onCreateOptionsMenu(menu, menuInflater);
         menuInflater.inflate(R.menu.group_member_picker, menu);
-
-
     }
 
     @Override
diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
index f1ff3c057b..1c7469f1dc 100644
--- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java
+++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
@@ -18,10 +18,6 @@ package com.android.contacts.preference;
 
 import android.content.res.Configuration;
 import android.database.Cursor;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.provider.ContactsContract.DisplayNameSources;
@@ -32,20 +28,13 @@ import android.support.annotation.StringRes;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatDelegate;
 import android.support.v7.widget.Toolbar;
-import android.text.Html;
-import android.text.Spannable;
-import android.text.SpannableString;
 import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 
 import com.android.contacts.R;
-import com.android.contacts.activities.PeopleActivity;
-import com.android.contacts.drawer.DrawerFragment;
 import com.android.contacts.editor.SelectAccountDialogFragment;
 import com.android.contacts.interactions.ImportDialogFragment;
 import com.android.contacts.list.ProviderStatusWatcher;
@@ -54,8 +43,6 @@ import com.android.contacts.preference.DisplayOptionsPreferenceFragment.ProfileL
 import com.android.contacts.preference.DisplayOptionsPreferenceFragment.ProfileQuery;
 import com.android.contacts.util.AccountSelectionUtil;
 
-import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
-
 /**
  * Contacts settings.
  */
@@ -85,7 +72,6 @@ public final class ContactsPreferenceActivity extends PreferenceActivity
         final ActionBar actionBar = mCompatDelegate.getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
-
         }
 
         mProviderStatusWatcher = ProviderStatusWatcher.getInstance(this);
@@ -111,16 +97,6 @@ public final class ContactsPreferenceActivity extends PreferenceActivity
                 setActivityTitle(R.string.activity_title_settings);
             }
         }
-
-       // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-
-        // this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-        //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
     }
 
     @Override
@@ -218,12 +194,8 @@ public final class ContactsPreferenceActivity extends PreferenceActivity
     private void setActivityTitle(@StringRes int res) {
         final ActionBar actionBar = mCompatDelegate.getSupportActionBar();
         if (actionBar != null) {
-            //actionBar.setTitle(res);
-            String title=this.getResources().getString(res);
-
-            actionBar.setTitle(Html.fromHtml("<font color='#007FFF'>"+title+" </font>"));
+            actionBar.setTitle(res);
         }
-
     }
 
     @Override
diff --git a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
index 16d9049270..82e90b3176 100644
--- a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
+++ b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
@@ -27,8 +27,6 @@ import android.content.IntentFilter;
 import android.content.Loader;
 import android.content.res.Resources;
 import android.database.Cursor;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.Preference;
@@ -193,7 +191,6 @@ public class DisplayOptionsPreferenceFragment extends PreferenceFragment
         mRootView = new FrameLayout(getActivity());
         final View list = super.onCreateView(inflater, mRootView, savedInstanceState);
         mRootView.addView(list);
-
         return mRootView;
     }
 
diff --git a/tests/res/layout/fill_call_log_test.xml b/tests/res/layout/fill_call_log_test.xml
index 51a97a8b95..01ade3ea33 100644
--- a/tests/res/layout/fill_call_log_test.xml
+++ b/tests/res/layout/fill_call_log_test.xml
@@ -38,7 +38,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/useRandomNumbers"
-        android:buttonTint="@color/color_default_blue1"
     />
     <Button
         android:id="@+id/add"
-- 
GitLab