From 452dfb7260cfb73637fa59401ba8f263a7389d85 Mon Sep 17 00:00:00 2001
From: Brad Stenning <stenning@google.com>
Date: Fri, 22 Jun 2018 15:01:11 -0700
Subject: [PATCH] Add an assist mic to the navigation bar

I also updated the notification hook to use the new NotifcationCenter

Bug:110275838
Test: on dev device and in car
Change-Id: I28d42f6d37226028602fea4ac4d8901ba587a1ce
(cherry picked from commit 4691a983e2c4aaea68c4b642cca788c0933a5e12)
---
 .../CarSystemUI/res/drawable/ic_mic_white.xml |  9 +++++++
 .../res/layout/car_navigation_bar.xml         | 24 +++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 packages/CarSystemUI/res/drawable/ic_mic_white.xml

diff --git a/packages/CarSystemUI/res/drawable/ic_mic_white.xml b/packages/CarSystemUI/res/drawable/ic_mic_white.xml
new file mode 100644
index 0000000000000..f5a91b5ded32b
--- /dev/null
+++ b/packages/CarSystemUI/res/drawable/ic_mic_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="48dp"
+        android:height="48dp"
+        android:viewportWidth="48.0"
+        android:viewportHeight="48.0">
+    <path
+        android:pathData="M24,28c3.31,0 5.98,-2.69 5.98,-6L30,10c0,-3.32 -2.68,-6 -6,-6 -3.31,0 -6,2.68 -6,6v12c0,3.31 2.69,6 6,6zM34.6,22c0,6 -5.07,10.2 -10.6,10.2 -5.52,0 -10.6,-4.2 -10.6,-10.2L10,22c0,6.83 5.44,12.47 12,13.44L22,42h4v-6.56c6.56,-0.97 12,-6.61 12,-13.44h-3.4z"
+        android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/packages/CarSystemUI/res/layout/car_navigation_bar.xml b/packages/CarSystemUI/res/layout/car_navigation_bar.xml
index c7dfa9b9934c8..b67ce15f80b08 100644
--- a/packages/CarSystemUI/res/layout/car_navigation_bar.xml
+++ b/packages/CarSystemUI/res/layout/car_navigation_bar.xml
@@ -107,11 +107,27 @@
             android:layout_height="match_parent"
             android:layout_weight="1"/>
 
-        <com.android.keyguard.AlphaOptimizedImageButton
-            android:id="@+id/notifications"
+        <com.android.systemui.statusbar.car.CarFacetButton
+            android:id="@+id/note"
             style="@style/NavigationBarButton"
-            android:background="?android:attr/selectableItemBackground"
-            android:src="@drawable/car_ic_notification"
+            systemui:icon="@drawable/car_ic_notification"
+            systemui:intent="intent:#Intent;component=com.android.car.notification/.CarNotificationCenterActivity;launchFlags=0x14000000;end"
+            systemui:packages="com.android.car.notification"
+            systemui:selectedIcon="@drawable/car_ic_notification_selected"
+            systemui:useMoreIcon="false"
+        />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+        <com.android.systemui.statusbar.car.CarFacetButton
+            android:id="@+id/assist"
+            style="@style/NavigationBarButton"
+            systemui:icon="@drawable/ic_mic_white"
+            systemui:intent="intent:#Intent;action=com.google.android.demandspace.START;end"
+            systemui:useMoreIcon="false"
         />
     </LinearLayout>