SearchBoxView now enables/disables cursor based on user interaction.

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"
@@ skipping 44 matching lines @@
 constexpr int kBackgroundBorderCornerRadius = 2;
 constexpr int kBackgroundBorderCornerRadiusFullscreen = 24;
 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 =
     SkColorSetARGBMacro(0xDE, 0x00, 0x00, 0x00);
 
+// Color used for placeholder text in zero query state.

[vadimt, 2017/06/22 22:47:40]

Color of placeholder ...

[newcomer, 2017/06/23 23:59:36]

Done.

+constexpr SkColor kZeroQuerySearchboxColor =
+    SkColorSetARGBMacro(0x8A, 0x00, 0x00, 0x00);
+
 // 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 {}
 
@@ skipping 65 matching lines @@
       view_delegate_(view_delegate),
       model_(nullptr),
       content_container_(new views::View),
       google_icon_(nullptr),
       back_button_(nullptr),
       speech_button_(nullptr),
       search_box_(new views::Textfield),
       contents_view_(nullptr),
       app_list_view_(app_list_view),
       focused_view_(FOCUS_SEARCH_BOX),
-      is_fullscreen_app_list_enabled_(features::IsFullscreenAppListEnabled()) {
+      is_fullscreen_app_list_enabled_(features::IsFullscreenAppListEnabled()),
+      is_cursor_enabled_(false) {

[vadimt, 2017/06/22 22:47:40]

= false in .h

[newcomer, 2017/06/23 23:59:37]

Done.

   SetLayoutManager(new views::FillLayout);
   SetPreferredSize(gfx::Size(is_fullscreen_app_list_enabled_
                                  ? kPreferredWidthFullscreen
                                  : kPreferredWidth,
                              kPreferredHeight));
   AddChildView(content_container_);
 
   SetShadow(GetShadowForZHeight(2));
   content_container_->SetBackground(base::MakeUnique<SearchBoxBackground>());
 
@@ skipping 14 matching lines @@
   if (is_fullscreen_app_list_enabled_) {
     google_icon_ = new views::ImageView();
     google_icon_->SetImage(gfx::CreateVectorIcon(
         kIcGoogleBlackIcon, kGoogleIconSize, kDefaultSearchboxColor));
     content_container_->AddChildView(google_icon_);
 
     search_box_->set_placeholder_text_color(kDefaultSearchboxColor);
     search_box_->set_placeholder_text_draw_flags(
         gfx::Canvas::TEXT_ALIGN_CENTER);
     search_box_->SetFontList(search_box_->GetFontList().DeriveWithSizeDelta(2));
+    search_box_->SetCursorEnabled(is_cursor_enabled_);
   } 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_);
@@ skipping 27 matching lines @@
   return !search_box_->text().empty();
 }
 
 void SearchBoxView::ClearSearch() {
   search_box_->SetText(base::string16());
   view_delegate_->AutoLaunchCanceled();
   // Updates model and fires query changed manually because SetText() above
   // does not generate ContentsChanged() notification.
   UpdateModel();
   NotifyQueryChanged();
+  if (is_fullscreen_app_list_enabled_) {
+    SetPlaceholderTextAndEnableCursor(!search_box_->text().empty());
+    if (app_list_view_)

[vadimt, 2017/06/22 22:47:40]

Is there a way for unit test to make app_list_view_ != null?
Still not quite happy about unit test codepaths deviating from the real ones.

[newcomer, 2017/06/23 23:59:36]

One solution is to create a class that is a SearchBoxViewObserver, we could have
AppListView inherit from that class. Then we can call observers here instead of
directly calling AppListView.

This would prevent the if statement.

+      app_list_view_->SetStateFromSearchBoxView(search_box_->text().empty());
+  }
 }
 
 void SearchBoxView::SetShadow(const gfx::ShadowValue& shadow) {
   if (is_fullscreen_app_list_enabled_)
     return;
 
   SetBorder(base::MakeUnique<views::ShadowBorder>(shadow));
   Layout();
 }
 
@@ skipping 83 matching lines @@
   if (!back_button_)
     return;
 
   base::string16 back_button_label(l10n_util::GetStringUTF16(
       folder ? IDS_APP_LIST_FOLDER_CLOSE_FOLDER_ACCESSIBILE_NAME
              : IDS_APP_LIST_BACK));
   back_button_->SetAccessibleName(back_button_label);
   back_button_->SetTooltipText(back_button_label);
 }
 
+void SearchBoxView::SetPlaceholderTextAndEnableCursor(bool enable) {

[vadimt, 2017/06/22 22:47:40]

The name is misleading, as you don't set (change) the text; could you come with
a different name?

[newcomer, 2017/06/23 23:59:37]

Renamed to SetSearchBoxActive(bool active)

+  search_box_->set_placeholder_text_draw_flags(
+      enable ? gfx::Canvas::TEXT_ALIGN_LEFT : gfx::Canvas::TEXT_ALIGN_CENTER);
+  search_box_->set_placeholder_text_color(enable ? kZeroQuerySearchboxColor
+                                                 : kDefaultSearchboxColor);
+  is_cursor_enabled_ = enable;
+  search_box_->SetCursorEnabled(enable);
+  search_box_->SchedulePaint();
+}
+
+bool SearchBoxView::PassMouseEventForTesting(ui::MouseEvent& mouse_event) {
+  return HandleMouseEvent(search_box_, mouse_event);
+}
+
 bool SearchBoxView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   if (contents_view_)
     return contents_view_->OnMouseWheel(event);
 
   return false;
 }
 
 void SearchBoxView::OnEnabledChanged() {
   search_box_->SetEnabled(enabled());
   if (speech_button_)
     speech_button_->SetEnabled(enabled());
 }
 
 const char* SearchBoxView::GetClassName() const {
   return "SearchBoxView";
 }
 
+void SearchBoxView::OnGestureEvent(ui::GestureEvent* event) {
+  if (!is_fullscreen_app_list_enabled_ || event->type() != ui::ET_GESTURE_TAP)
+    return;
+
+  // If the search box is empty and the cursor is not enabled, enable the cursor
+  // and shift the placeholder text left.
+  if (search_box_->text().empty() && !is_cursor_enabled_)
+    SetPlaceholderTextAndEnableCursor(true);
+}
+
+void SearchBoxView::OnMouseEvent(ui::MouseEvent* event) {
+  if (!is_fullscreen_app_list_enabled_ || event->type() != ui::ET_MOUSE_PRESSED)
+    return;
+
+  // If the search box is empty and the cursor is not enabled, enable the cursor
+  // and shift the placeholder text left.
+  if (search_box_->text().empty() && !is_cursor_enabled_)
+    SetPlaceholderTextAndEnableCursor(true);

[vadimt, 2017/06/22 22:47:40]

Please make a note: what to do when Meta+Arrow accessibility focus arrives to
Search box.

[newcomer, 2017/06/23 23:59:36]

Created a bug for this. 

+}
+
 void SearchBoxView::UpdateModel() {
   // Temporarily remove from observer to ignore notifications caused by us.
   model_->search_box()->RemoveObserver(this);
   model_->search_box()->Update(search_box_->text(), false);
   model_->search_box()->SetSelectionModel(search_box_->GetSelectionModel());
   model_->search_box()->AddObserver(this);
 }
 
 void SearchBoxView::NotifyQueryChanged() {
   DCHECK(delegate_);
   delegate_->QueryChanged(this);
 }
 
 void SearchBoxView::ContentsChanged(views::Textfield* sender,
                                     const base::string16& new_contents) {
   UpdateModel();
   view_delegate_->AutoLaunchCanceled();
   NotifyQueryChanged();
-  if (is_fullscreen_app_list_enabled_)
-    app_list_view_->SetStateFromSearchBoxView(search_box_->text().empty());
+  if (is_fullscreen_app_list_enabled_) {
+    SetPlaceholderTextAndEnableCursor(!search_box_->text().empty());
+    if (app_list_view_)
+      app_list_view_->SetStateFromSearchBoxView(search_box_->text().empty());
+  }
 }
 
 bool SearchBoxView::HandleKeyEvent(views::Textfield* sender,
                                    const ui::KeyEvent& key_event) {
   if (key_event.type() == ui::ET_KEY_PRESSED) {
     if (key_event.key_code() == ui::VKEY_TAB &&
         focused_view_ != FOCUS_CONTENTS_VIEW &&
         MoveTabFocus(key_event.IsShiftDown()))
       return true;
 
@@ skipping 33 matching lines @@
         speech_button_->OnKeyReleased(key_event))
       return true;
 
     return contents_view_ && contents_view_->visible() &&
            contents_view_->OnKeyReleased(key_event);
   }
 
   return false;
 }
 
+bool SearchBoxView::HandleMouseEvent(views::Textfield* sender,
+                                     const ui::MouseEvent& mouse_event) {
+  if (!is_fullscreen_app_list_enabled_)
+    return false;
+
+  if (search_box_->text().empty() && !is_cursor_enabled_)
+    SetPlaceholderTextAndEnableCursor(true);
+
+  return true;
+}
+
+void SearchBoxView::NotifyOnGestureEvent() {

[vadimt, 2017/06/22 22:47:40]

Do we need both this and SearchBoxView::OnGestureEvent?

[newcomer, 2017/06/23 23:59:37]

refactored to HandleGestureEvent like the other functions in the base class
TextfieldController.

+  if (!is_fullscreen_app_list_enabled_)
+    return;
+
+  if (search_box_->text().empty() && !is_cursor_enabled_)
+    SetPlaceholderTextAndEnableCursor(true);
+}
+
 void SearchBoxView::ButtonPressed(views::Button* sender,
                                   const ui::Event& event) {
   if (back_button_ && sender == back_button_)
     delegate_->BackButtonPressed();
   else if (speech_button_ && sender == speech_button_)
     view_delegate_->StartSpeechRecognition();
   else
     NOTREACHED();
 }
 
@@ skipping 54 matching lines @@
   NotifyQueryChanged();
 }
 
 void SearchBoxView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   SpeechRecognitionButtonPropChanged();
   SchedulePaint();
 }
 
 }  // namespace app_list