assistant: update launcher icon

Use Assistant icon instead of mic icon.

Bug: 997734
Test: locally build and test
Change-Id: I69a9134a4bdbfcf24e34c2c166e372f594ef609d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1829489
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Tao Wu <wutao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701211}

ash/app_list/views/search_box_view.cc

@@ -798,17 +798,13 @@ void SearchBoxView::SetupAssistantButton() {
     return;
   }
 
-  const bool embedded_assistant =
-      app_list_features::IsEmbeddedAssistantUIEnabled();
   views::ImageButton* assistant = assistant_button();
   assistant->SetImage(
       views::ImageButton::STATE_NORMAL,
-      gfx::CreateVectorIcon(
-          embedded_assistant ? ash::kAssistantMicIcon : ash::kAssistantIcon,
-          search_box::kIconSize, gfx::kGoogleGrey700));
-  base::string16 assistant_button_label(l10n_util::GetStringUTF16(
-      embedded_assistant ? IDS_APP_LIST_START_ASSISTANT_VOICE_QUERY
-                         : IDS_APP_LIST_START_ASSISTANT));
+      gfx::CreateVectorIcon(ash::kAssistantIcon, search_box::kIconSize,
+                            gfx::kGoogleGrey700));
+  base::string16 assistant_button_label(
+      l10n_util::GetStringUTF16(IDS_APP_LIST_START_ASSISTANT));
   assistant->SetAccessibleName(assistant_button_label);
   assistant->SetTooltipText(assistant_button_label);
 }

ash/resources/vector_icons/BUILD.gn

@@ -11,7 +11,6 @@ aggregate_vector_icons("ash_vector_icons") {
   icons = [
     "always_show_shelf.icon",
     "assistant.icon",
-    "assistant_mic.icon",
     "auto_hide.icon",
     "autoclick.icon",
     "autoclick_close.icon",

ash/resources/vector_icons/assistant_mic.icon

-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-CANVAS_DIMENSIONS, 24,
-PATH_COLOR_ARGB, 0xFF, 0x42, 0x85, 0xF4,
-MOVE_TO, 12, 15,
-R_ARC_TO, 3, 3, 0, 0, 0, 3, -3,
-V_LINE_TO, 5,
-R_ARC_TO, 3, 3, 0, 0, 0, -6, 0,
-R_V_LINE_TO, 7,
-R_ARC_TO, 3, 3, 0, 0, 0, 3, 3,
-CLOSE,
-NEW_PATH,
-PATH_COLOR_ARGB, 0xFF, 0x34, 0xA8, 0x53,
-MOVE_TO, 11, 18.92f,
-R_H_LINE_TO, 2,
-V_LINE_TO, 22,
-R_H_LINE_TO, -2,
-CLOSE,
-NEW_PATH,
-PATH_COLOR_ARGB, 0xFF, 0xFA, 0xBB, 0x05,
-MOVE_TO, 7, 12,
-H_LINE_TO, 5,
-R_ARC_TO, 7, 7, 0, 0, 0, 2, 4.95f,
-R_LINE_TO, 1.41f, -1.41f,
-ARC_TO, 5, 5, 0, 0, 1, 7, 12,
-CLOSE,
-NEW_PATH,
-PATH_COLOR_ARGB, 0xFF, 0xE9, 0x42, 0x35,
-MOVE_TO, 12, 17,
-R_ARC_TO, 5, 5, 0, 0, 1, -3.54f, -1.47f,
-R_LINE_TO, -1.41f, 1.42f,
-ARC_TO, 7, 7, 0, 0, 0, 19, 12,
-R_H_LINE_TO, -2,
-R_ARC_TO, 5, 5, 0, 0, 1, -5, 5,
-CLOSE

ui/strings/ui_strings.grd

@@ -871,10 +871,7 @@ need to be translated for each locale.-->
         Remove
       </message>
       <message name="IDS_APP_LIST_START_ASSISTANT" desc="Tooltip for the button that starts Google Assistant from the search box in the app list.">
-        Start Google Assistant
-      </message>
-      <message name="IDS_APP_LIST_START_ASSISTANT_VOICE_QUERY" desc="Tooltip for the button that starts Google Assistant voice query from the search box in the app list.">
-        Start Google Assistant voice query
+        Google Assistant
       </message>
       <message name="IDS_APP_LIST_PAGE_SWITCHER" desc="Tooltip for page switcher for each page in fullscreen view which shows all apps.">
         Page <ph name="selected_page">$1<ex>1</ex></ph> of <ph name="total_page_num">$2<ex>3</ex></ph>