Making answer card to behave like other results.

ui/app_list/views/search_result_answer_card_view.cc

Index: ui/app_list/views/search_result_answer_card_view.cc
diff --git a/ui/app_list/views/search_result_answer_card_view.cc b/ui/app_list/views/search_result_answer_card_view.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d2d2da6e6e9dafffc6654c4c0f1abfc2f531ee95
--- /dev/null
+++ b/ui/app_list/views/search_result_answer_card_view.cc
@@ -0,0 +1,140 @@
+// Copyright 2017 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_result_answer_card_view.h"
+
+#include "ui/app_list/app_list_constants.h"
+#include "ui/app_list/app_list_features.h"
+#include "ui/app_list/views/search_result_page_view.h"
+#include "ui/views/background.h"
+#include "ui/views/controls/button/custom_button.h"
+#include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/fill_layout.h"
+
+namespace app_list {
+
+namespace {
+
+// Answer card relevance is high to always have it first.
+constexpr double kSearchAnswerCardRelevance = 100;
+
+// Container of the search answer view.
+class SearchAnswerContainerView : public views::CustomButton {
+ public:
+  explicit SearchAnswerContainerView(views::View* search_results_page_view)
+      : CustomButton(nullptr),
+        search_results_page_view_(search_results_page_view) {
+    // Center the card horizontally in the container.
+    views::BoxLayout* answer_container_layout =
+        new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
+    answer_container_layout->set_main_axis_alignment(
+        views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
+    SetLayoutManager(answer_container_layout);
+  }
+
+  void SetSelected(bool selected) {
+    if (selected == selected_)
+      return;
+    selected_ = selected;
+    UpdateBackgroundColor();
+  }
+
+  // views::CustomButton overrides:
+  void ChildPreferredSizeChanged(View* child) override {
+    // Card size changed.
+    if (visible())
+      search_results_page_view_->Layout();
+  }
+
+  const char* GetClassName() const override {
+    return "SearchAnswerContainerView";
+  }
+
+  void StateChanged(ButtonState old_state) override { UpdateBackgroundColor(); }
+
+ private:
+  void UpdateBackgroundColor() {
+    views::Background* background = nullptr;
+
+    if (selected_) {
+      background = views::Background::CreateSolidBackground(kSelectedColor);
+    } else if (state() == STATE_HOVERED || state() == STATE_PRESSED) {
+      background = views::Background::CreateSolidBackground(kHighlightedColor);
+    }
+
+    set_background(background);
+    SchedulePaint();
+  }
+
+  views::View* const search_results_page_view_;
+  bool selected_ = false;
+
+  DISALLOW_COPY_AND_ASSIGN(SearchAnswerContainerView);
+};
+
+}  // namespace
+
+SearchResultAnswerCardView::SearchResultAnswerCardView(
+    AppListModel* model,
+    SearchResultPageView* search_results_page_view,
+    views::View* search_answer_view)
+    : model_(model),
+      search_answer_container_view_(
+          new SearchAnswerContainerView(search_results_page_view)) {
+  search_answer_container_view_->SetVisible(false);
+  search_answer_container_view_->AddChildView(search_answer_view);
+  AddChildView(search_answer_container_view_);
+  model->AddObserver(this);

[xiyuan, 2017/05/25 16:42:53]

We don't need to explicitly start/stop observing the model if we get the model
via SetResults call.

[vadimt, 2017/05/25 20:15:16]

We do this for OnSearchAnswerAvailableChanged() callback to know that knowledge
card should be shown/hidden.

As for the "results", there are no results proper, there is just a web view
always sitting here, and SearchAnswerWebContentsDelegate() occasionally
proclaiming that it has/hasn't meaningful contents.

So we use SearchResultContainerView as a convenient UI element, but deliver
results in a custom way.

I considered converting everything to an orthodox result view, with creating a
search provider that returns a web view passed as a result, but didn't find big
value in it, except for some additional engineering work. But it's a question of
taste, I guess.

[xiyuan, 2017/05/25 20:52:04]

You are right. |model_| is not a SearchResults. The existing code is good.

+}
+
+SearchResultAnswerCardView::~SearchResultAnswerCardView() {
+  model_->RemoveObserver(this);
+}
+
+void SearchResultAnswerCardView::OnContainerSelected(
+    bool from_bottom,
+    bool directional_movement) {
+  if (num_results() == 0)
+    return;
+
+  SetSelectedIndex(0);
+}
+
+int SearchResultAnswerCardView::GetYSize() {
+  return num_results();
+}
+
+int SearchResultAnswerCardView::DoUpdate() {
+  const bool have_result = search_answer_container_view_->visible() &&
+                           !features::IsAnswerCardDarkRunEnabled();
+  set_container_score(have_result ? kSearchAnswerCardRelevance : 0);
+  SetLayoutManager(have_result ? new views::FillLayout : nullptr);

[xiyuan, 2017/05/25 16:42:53]

Why do we need to do this? Can we set FillLayout in ctor just once?

[vadimt, 2017/05/25 20:15:16]

You are right; not needed anymore.

[vadimt, 2017/05/25 22:59:04]

Actually, there is a bug/feature of FillLayout: it doesn't look at the child's
visibility. So while the child is not ready to be shown, we happily show an
empty rectangle that has a child size.
Restoring the original code.

[xiyuan, 2017/05/25 23:01:21]

In this case, since we have only one child, I would prefer to implement
GetPreferredSize and Layout instead of adding/removing FillLayout.

[vadimt, 2017/05/26 20:25:03]

Solved.

+  return have_result ? 1 : 0;
+}
+
+void SearchResultAnswerCardView::UpdateSelectedIndex(int old_selected,
+                                                     int new_selected) {
+  if (new_selected == old_selected)
+    return;
+
+  const bool is_selected = new_selected == 0;
+  search_answer_container_view_->SetSelected(is_selected);
+  if (is_selected)
+    NotifyAccessibilityEvent(ui::AX_EVENT_SELECTION, true);
+}
+
+const char* SearchResultAnswerCardView::GetClassName() const {
+  return "SearchResultAnswerCardView";
+}
+
+void SearchResultAnswerCardView::OnSearchAnswerAvailableChanged(
+    bool has_answer) {
+  if (has_answer == search_answer_container_view_->visible())
+    return;
+
+  search_answer_container_view_->SetVisible(has_answer);
+  ScheduleUpdate();
+}
+
+}  // namespace app_list