cros: add google/mic icons to searchbox

ui/app_list/views/search_box_view.cc

 // Copyright (c) 2012 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.
 
 #include "ui/app_list/views/search_box_view.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_features.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/resources/grit/app_list_resources.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/speech_ui_model.h"
+#include "ui/app_list/vector_icons.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view_delegate.h"
 #include "ui/base/ime/text_input_flags.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
+#include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/border.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/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/shadow_border.h"
 #include "ui/views/widget/widget.h"
 
 namespace app_list {
 
 namespace {
 
 const int kPadding = 16;
 const int kInnerPadding = 24;
 const int kPreferredWidth = 360;
 const int kPreferredWidthFullscreen = 544;
 const int kPreferredHeight = 48;
 
 const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
 
 const int kBackgroundBorderCornerRadius = 2;
 const int kBackgroundBorderCornerRadiusFullscreen = 20;
 
+constexpr int kGoogleIconSize = 24;
+constexpr int kMicIconSize = 24;
+
+// Default color used when wallpaper customized color is not available for
+// searchbox, #000 at 87% opacity.
+constexpr SkColor kDefaultSearchboxColor =
+    SkColorSetA(SK_ColorTRANSPARENT, 0xDE);

[xiyuan, 2017/06/13 20:10:41]

nit: SK_ColorTRANSPARENT -> SK_ColorBLACK. Techniquely, this is black as the
comment says, rather than transparency.

[xiyuan, 2017/06/13 20:10:41]

Prefer to use SkColorSetARGBMacro instead of SkColorSetA because I am not sure
what compiler would do to call an inline function to initialize a global var.

[Qiang(Joe) Xu, 2017/06/13 20:50:53]

Done.

+
+bool IsFullscreenAppListEnabled() {

[xiyuan, 2017/06/13 20:10:41]

Get rid of this. Alex has a CL (https://codereview.chromium.org/2934513004/)
that adds a bool member in SearchBoxView for this purpose. Please rebase and use
that.

[Qiang(Joe) Xu, 2017/06/13 20:50:53]

Done.

+  // Cache this value to avoid repeated lookup.
+  static bool cached_value = features::IsFullscreenAppListEnabled();
+  return cached_value;
+}
+
 // A background that paints a solid white rounded rect with a thin grey border.
 class SearchBoxBackground : public views::Background {
  public:
   SearchBoxBackground()
       : background_border_corner_radius_(
             features::IsFullscreenAppListEnabled()
                 ? kBackgroundBorderCornerRadiusFullscreen
                 : kBackgroundBorderCornerRadius) {}
   ~SearchBoxBackground() override {}
 
  private:
   // views::Background overrides:
   void Paint(gfx::Canvas* canvas, views::View* view) const override {
     gfx::Rect bounds = view->GetContentsBounds();
 
     cc::PaintFlags flags;
     flags.setAntiAlias(true);
-    flags.setColor(kSearchBoxBackground);
+    flags.setColor(kSearchBoxBackgroundDefault);
     canvas->DrawRoundRect(bounds, background_border_corner_radius_, flags);
   }
 
   const int background_border_corner_radius_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchBoxBackground);
 };
 
 }  // namespace
 
@@ skipping 40 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SearchBoxImageButton);
 };
 
 SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
                              AppListViewDelegate* view_delegate,
                              AppListView* app_list_view)
     : delegate_(delegate),
       view_delegate_(view_delegate),
       model_(NULL),
       content_container_(new views::View),
+      google_icon_(new views::ImageView),

[xiyuan, 2017/06/13 20:10:41]

This leaks for the old behavior since |google_icon_| is not added to views
hierarchy in that case.

[Qiang(Joe) Xu, 2017/06/13 20:50:53]

Done.

       back_button_(NULL),
       speech_button_(NULL),
       search_box_(new views::Textfield),
       contents_view_(NULL),
       app_list_view_(app_list_view),
       focused_view_(FOCUS_SEARCH_BOX),
       is_fullscreen_app_list_enabled_(features::IsFullscreenAppListEnabled()) {
   SetLayoutManager(new views::FillLayout);
   SetPreferredSize(gfx::Size(is_fullscreen_app_list_enabled_
                                  ? kPreferredWidthFullscreen
                                  : kPreferredWidth,
                              kPreferredHeight));
   AddChildView(content_container_);
 
   SetShadow(GetShadowForZHeight(2));
-  back_button_ = new SearchBoxImageButton(this);
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  back_button_->SetImage(views::ImageButton::STATE_NORMAL,
-                         rb.GetImageSkiaNamed(IDR_APP_LIST_FOLDER_BACK_NORMAL));
-  back_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
-                                  views::ImageButton::ALIGN_MIDDLE);
-  SetBackButtonLabel(false);
-  content_container_->AddChildView(back_button_);
   content_container_->SetBackground(base::MakeUnique<SearchBoxBackground>());
 
   views::BoxLayout* layout = new views::BoxLayout(
       views::BoxLayout::kHorizontal, gfx::Insets(0, kPadding),
       kInnerPadding - views::Textfield::kTextPadding);
   content_container_->SetLayoutManager(layout);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   layout->set_minimum_cross_axis_size(kPreferredHeight);
 
   search_box_->SetBorder(views::NullBorder());
   search_box_->SetTextColor(kSearchTextColor);
-  search_box_->SetBackgroundColor(kSearchBoxBackground);
-  search_box_->set_placeholder_text_color(kHintTextColor);
+  search_box_->SetBackgroundColor(kSearchBoxBackgroundDefault);
   search_box_->set_controller(this);
   search_box_->SetTextInputType(ui::TEXT_INPUT_TYPE_SEARCH);
   search_box_->SetTextInputFlags(ui::TEXT_INPUT_FLAG_AUTOCORRECT_OFF);
+  if (features::IsFullscreenAppListEnabled()) {
+    google_icon_->SetImage(gfx::CreateVectorIcon(
+        kIcGoogleBlackIcon, kGoogleIconSize, kDefaultSearchboxColor));
+    content_container_->AddChildView(google_icon_);
+
+    search_box_->set_placeholder_text_color(kDefaultSearchboxColor);
+  } else {
+    back_button_ = new SearchBoxImageButton(this);
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    back_button_->SetImage(
+        views::ImageButton::STATE_NORMAL,
+        rb.GetImageSkiaNamed(IDR_APP_LIST_FOLDER_BACK_NORMAL));
+    back_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
+                                    views::ImageButton::ALIGN_MIDDLE);
+    SetBackButtonLabel(false);
+    content_container_->AddChildView(back_button_);
+
+    search_box_->set_placeholder_text_color(kHintTextColor);
+  }
   content_container_->AddChildView(search_box_);
   layout->SetFlexForView(search_box_, 1);
 
   view_delegate_->GetSpeechUI()->AddObserver(this);
   ModelChanged();
 }
 
 SearchBoxView::~SearchBoxView() {
   view_delegate_->GetSpeechUI()->RemoveObserver(this);
   model_->search_box()->RemoveObserver(this);
@@ skipping 227 matching lines @@
 void SearchBoxView::SpeechRecognitionButtonPropChanged() {
   const SearchBoxModel::SpeechButtonProperty* speech_button_prop =
       model_->search_box()->speech_button();
   if (speech_button_prop) {
     if (!speech_button_) {
       speech_button_ = new SearchBoxImageButton(this);
       content_container_->AddChildView(speech_button_);
     }
 
     speech_button_->SetAccessibleName(speech_button_prop->accessible_name);
+    if (IsFullscreenAppListEnabled()) {
+      speech_button_->SetImage(
+          views::Button::STATE_NORMAL,
+          gfx::CreateVectorIcon(kIcMicBlackIcon, kMicIconSize,
+                                kDefaultSearchboxColor));

[xiyuan, 2017/06/13 20:10:41]

So we will show the mic icon regardless of the speech UI state?

[Qiang(Joe) Xu, 2017/06/13 20:50:53]

Specification doesn't mention this. I think we can show it, as the OK google UI
will be shown on top of searchbox right now.

[xiyuan, 2017/06/13 21:09:27]

Acknowledged.

+    }
     if (view_delegate_->GetSpeechUI()->state() ==
         SPEECH_RECOGNITION_HOTWORD_LISTENING) {
-      speech_button_->SetImage(
-          views::Button::STATE_NORMAL, &speech_button_prop->on_icon);
+      if (!IsFullscreenAppListEnabled()) {
+        speech_button_->SetImage(views::Button::STATE_NORMAL,
+                                 &speech_button_prop->on_icon);
+      }
       speech_button_->SetTooltipText(speech_button_prop->on_tooltip);

[xiyuan, 2017/06/13 20:10:41]

It is a bit strange that we change the image optionally but always change the
tooltip. Can you double check?

[Qiang(Joe) Xu, 2017/06/13 20:50:53]

The tooltip is changed based on whether OK google is waiting on hotword voice.
And the old behavior has two mic icons based on whether OK google is enabled.

New behavior is using one icon, no matter OK google is enabled or not. 

We really cannot see the tooltip when hotword is waiting on voice as the current
UI has "ok google" card which hides the searchbox.

We probably should remove on_tooltip, even in current behavior. Let me confirm
with PM and open a bug for this.

[xiyuan, 2017/06/13 21:09:27]

Thanks for the clarification.

     } else {
-      speech_button_->SetImage(
-          views::Button::STATE_NORMAL, &speech_button_prop->off_icon);
+      if (!IsFullscreenAppListEnabled()) {
+        speech_button_->SetImage(views::Button::STATE_NORMAL,
+                                 &speech_button_prop->off_icon);
+      }
       speech_button_->SetTooltipText(speech_button_prop->off_tooltip);
     }
   } else {
     if (speech_button_) {
       // Deleting a view will detach it from its parent.
       delete speech_button_;
       speech_button_ = NULL;
     }
   }
   Layout();
@@ skipping 14 matching lines @@
   NotifyQueryChanged();
 }
 
 void SearchBoxView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   SpeechRecognitionButtonPropChanged();
   SchedulePaint();
 }
 
 }  // namespace app_list