Snap for 4821244 from a35eb59a56f01e7b2b3675b58d2839836a8777be to pi-release

Change-Id: Id09d44f38305d964382fdd8d3a53fcaa7cc72f25
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4681aa2..d09bffb 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -20,7 +20,7 @@
         <item name="android:colorPrimary">@android:color/transparent</item>
         <item name="android:colorPrimaryDark">@color/phone_status_bar_theme</item>
         <item name="android:textColorPrimary">@android:color/black</item>
-        <item name="drawerClosedHeaderColor">@color/car_title2</item>
+        <item name="drawerHeaderColor">@color/car_title2</item>
         <item name="drawerBackgroundColor">@color/phone_theme</item>
     </style>
 
diff --git a/src/com/android/car/dialer/TelecomActivity.java b/src/com/android/car/dialer/TelecomActivity.java
index 0608990..5ec5493 100644
--- a/src/com/android/car/dialer/TelecomActivity.java
+++ b/src/com/android/car/dialer/TelecomActivity.java
@@ -82,9 +82,6 @@
         super.onCreate(savedInstanceState);
         setToolbarElevation(0f);
 
-        // Set toolbar to be click through so that the search icon can be clicked.
-        setToolbarClickThrough(true);
-
         if (vdebug()) {
             Log.d(TAG, "onCreate");
         }