Commit 685f5048 authored by Xiaohui Chen's avatar Xiaohui Chen Committed by Commit Bot

assistant: change to static icon

Bug: b:114298169
Change-Id: I5793924de4e2f61f70ba1f3b9020b5aaf111ad85
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2543197Reviewed-by: default avatarTao Wu <wutao@chromium.org>
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828398}
parent a70ba859
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "ash/assistant/ui/assistant_view_ids.h" #include "ash/assistant/ui/assistant_view_ids.h"
#include "ash/assistant/ui/base/assistant_button.h" #include "ash/assistant/ui/base/assistant_button.h"
#include "ash/assistant/ui/dialog_plate/mic_view.h" #include "ash/assistant/ui/dialog_plate/mic_view.h"
#include "ash/assistant/ui/logo_view/logo_view.h"
#include "ash/assistant/util/animation_util.h" #include "ash/assistant/util/animation_util.h"
#include "ash/keyboard/ui/keyboard_ui_controller.h" #include "ash/keyboard/ui/keyboard_ui_controller.h"
#include "ash/public/cpp/assistant/controller/assistant_interaction_controller.h" #include "ash/public/cpp/assistant/controller/assistant_interaction_controller.h"
...@@ -22,6 +21,7 @@ ...@@ -22,6 +21,7 @@
#include "ash/strings/grit/ash_strings.h" #include "ash/strings/grit/ash_strings.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "chromeos/ui/vector_icons/vector_icons.h"
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
#include "ui/compositor/callback_layer_animation_observer.h" #include "ui/compositor/callback_layer_animation_observer.h"
#include "ui/compositor/layer_animator.h" #include "ui/compositor/layer_animator.h"
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "ui/gfx/paint_vector_icon.h" #include "ui/gfx/paint_vector_icon.h"
#include "ui/views/border.h" #include "ui/views/border.h"
#include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/image_button.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/textfield/textfield.h" #include "ui/views/controls/textfield/textfield.h"
#include "ui/views/layout/box_layout.h" #include "ui/views/layout/box_layout.h"
#include "ui/views/layout/fill_layout.h" #include "ui/views/layout/fill_layout.h"
...@@ -311,11 +312,11 @@ void AssistantDialogPlate::InitLayout() { ...@@ -311,11 +312,11 @@ void AssistantDialogPlate::InitLayout() {
views::BoxLayout::CrossAxisAlignment::kCenter); views::BoxLayout::CrossAxisAlignment::kCenter);
// Molecule icon. // Molecule icon.
molecule_icon_ = AddChildView(LogoView::Create()); molecule_icon_ = AddChildView(std::make_unique<views::ImageView>());
molecule_icon_->SetID(AssistantViewID::kModuleIcon); molecule_icon_->SetID(AssistantViewID::kModuleIcon);
molecule_icon_->SetPreferredSize(gfx::Size(kIconSizeDip, kIconSizeDip)); molecule_icon_->SetPreferredSize(gfx::Size(kIconSizeDip, kIconSizeDip));
molecule_icon_->SetState(LogoView::State::kMoleculeWavy, molecule_icon_->SetImage(gfx::CreateVectorIcon(
/*animate=*/false); chromeos::kAssistantIcon, kIconSizeDip, gfx::kPlaceholderColor));
// Input modality layout container. // Input modality layout container.
input_modality_layout_container_ = input_modality_layout_container_ =
......
...@@ -28,11 +28,11 @@ class CallbackLayerAnimationObserver; ...@@ -28,11 +28,11 @@ class CallbackLayerAnimationObserver;
namespace views { namespace views {
class ImageButton; class ImageButton;
class ImageView;
} // namespace views } // namespace views
namespace ash { namespace ash {
class AssistantViewDelegate; class AssistantViewDelegate;
class LogoView;
class MicView; class MicView;
// AssistantDialogPlate -------------------------------------------------------- // AssistantDialogPlate --------------------------------------------------------
...@@ -98,7 +98,7 @@ class APP_LIST_EXPORT AssistantDialogPlate ...@@ -98,7 +98,7 @@ class APP_LIST_EXPORT AssistantDialogPlate
AssistantViewDelegate* const delegate_; AssistantViewDelegate* const delegate_;
// The following views are all owned by the view hierarchy // The following views are all owned by the view hierarchy
LogoView* molecule_icon_ = nullptr; views::ImageView* molecule_icon_ = nullptr;
views::View* input_modality_layout_container_ = nullptr; views::View* input_modality_layout_container_ = nullptr;
views::View* keyboard_layout_container_ = nullptr; views::View* keyboard_layout_container_ = nullptr;
views::View* voice_layout_container_ = nullptr; views::View* voice_layout_container_ = nullptr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment