cros: add SUGGESTED APPS indicator to start page

ui/app_list/views/start_page_view.cc

 // Copyright 2014 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/start_page_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_features.h"
 #include "ui/app_list/app_list_item.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/search_result.h"
 #include "ui/app_list/views/all_apps_tile_item_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/custom_launcher_page_view.h"
+#include "ui/app_list/views/indicator_chip_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/search_result_container_view.h"
 #include "ui/app_list/views/search_result_tile_item_view.h"
 #include "ui/app_list/views/tile_item_view.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
+#include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace app_list {
 
 namespace {
 
 // Layout constants.
+constexpr int kSearchBoxTopPadding = 24;
 constexpr int kInstantContainerSpacing = 24;
 constexpr int kSearchBoxAndTilesSpacing = 35;
+constexpr int kSearchBoxAndIndicatorSpacing = 21;
 constexpr int kStartPageSearchBoxWidth = 480;
+constexpr int kStartPageSearchBoxWidthFullscreen = 544;
 
 // WebView constants.
 constexpr int kWebViewWidth = 700;
 constexpr int kWebViewHeight = 224;
 
 // Tile container constants.
 constexpr int kTileSpacing = 7;
 constexpr int kNumStartPageTilesCols = 5;
 constexpr int kTilesHorizontalMarginLeft = 145;
 constexpr int kCenterColumnOfStartPageAppGrid = 3;
@@ skipping 216 matching lines @@
 // StartPageView implementation:
 StartPageView::StartPageView(AppListMainView* app_list_main_view,
                              AppListViewDelegate* view_delegate,
                              AppListView* app_list_view)
     : app_list_main_view_(app_list_main_view),
       view_delegate_(view_delegate),
       search_box_spacer_view_(new View()),
       instant_container_(new views::View),
       custom_launcher_page_background_(new CustomLauncherPageBackgroundView(
           view_delegate_->GetModel()->custom_launcher_page_name())),
+      indicator_(nullptr),

[xiyuan, 2017/06/22 22:33:52]

nit: initialize in header

[Qiang(Joe) Xu, 2017/06/22 22:47:27]

Done.

       tiles_container_(new StartPageTilesContainer(
           app_list_main_view->contents_view(),
           new AllAppsTileItemView(app_list_main_view_->contents_view(),
                                   app_list_view),
-          view_delegate)) {
+          view_delegate)),
+      is_fullscreen_app_list_enabled_(features::IsFullscreenAppListEnabled()) {
   search_box_spacer_view_->SetPreferredSize(gfx::Size(
-      kStartPageSearchBoxWidth,
+      is_fullscreen_app_list_enabled_ ? kStartPageSearchBoxWidthFullscreen
+                                      : kStartPageSearchBoxWidth,
       app_list_main_view->search_box_view()->GetPreferredSize().height()));
 
   // The view containing the start page WebContents and SearchBoxSpacerView.
   InitInstantContainer();
   AddChildView(instant_container_);
 
+  if (is_fullscreen_app_list_enabled_) {
+    indicator_ = new IndicatorChipView(
+        l10n_util::GetStringUTF16(IDS_SUGGESTED_APPS_INDICATOR));
+    AddChildView(indicator_);
+  }
+
   // The view containing the start page tiles.
   AddChildView(tiles_container_);
   AddChildView(custom_launcher_page_background_);
 
   tiles_container_->SetResults(view_delegate_->GetModel()->results());
 }
 
-StartPageView::~StartPageView() {
-}
+StartPageView::~StartPageView() = default;
 
 void StartPageView::InitInstantContainer() {
   views::BoxLayout* instant_layout_manager = new views::BoxLayout(
       views::BoxLayout::kVertical, gfx::Insets(), kInstantContainerSpacing);
-  instant_layout_manager->set_inside_border_insets(
-      gfx::Insets(0, 0, kSearchBoxAndTilesSpacing, 0));
+  if (is_fullscreen_app_list_enabled_) {
+    instant_layout_manager->set_inside_border_insets(
+        gfx::Insets(kSearchBoxTopPadding, 0, kSearchBoxAndIndicatorSpacing, 0));
+  } else {
+    instant_layout_manager->set_inside_border_insets(
+        gfx::Insets(0, 0, kSearchBoxAndTilesSpacing, 0));
+  }
   instant_layout_manager->set_main_axis_alignment(
       views::BoxLayout::MAIN_AXIS_ALIGNMENT_END);
   instant_layout_manager->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   instant_container_->SetLayoutManager(instant_layout_manager);
 
   // Create the view for the Google Doodle if the fullscreen launcher is not
   // enabled.
-  if (!features::IsFullscreenAppListEnabled()) {
+  if (!is_fullscreen_app_list_enabled_) {
     views::View* web_view = view_delegate_->CreateStartPageWebView(
         gfx::Size(kWebViewWidth, kWebViewHeight));
 
     if (web_view) {
       web_view->SetFocusBehavior(FocusBehavior::NEVER);
       instant_container_->AddChildView(web_view);
     }
   }
 
   instant_container_->AddChildView(search_box_spacer_view_);
@@ skipping 55 matching lines @@
 gfx::Rect StartPageView::GetSearchBoxBounds() const {
   return search_box_spacer_view_->bounds() +
          GetPageBoundsForState(AppListModel::STATE_START).OffsetFromOrigin();
 }
 
 void StartPageView::Layout() {
   gfx::Rect bounds(GetContentsBounds());
   bounds.set_height(instant_container_->GetHeightForWidth(bounds.width()));
   instant_container_->SetBoundsRect(bounds);
 
-  // Tiles begin where the instant container ends.
+  // For old launcher, tiles begin where the instant container ends; for
+  // fullscreen app list launcher, tiles begin where the |indicator_| ends.
   bounds.set_y(bounds.bottom());
+  if (indicator_) {
+    gfx::Rect indicator_rect(bounds);
+    indicator_rect.Offset(
+        (indicator_rect.width() - indicator_->GetPreferredSize().width()) / 2,
+        0);
+    indicator_->SetBoundsRect(indicator_rect);
+    bounds.Inset(0, indicator_->GetPreferredSize().height(), 0, 0);
+  }
   bounds.set_height(tiles_container_->GetHeightForWidth(bounds.width()));
   tiles_container_->SetBoundsRect(bounds);
 
   CustomLauncherPageView* custom_launcher_page_view =
       app_list_main_view_->contents_view()->custom_page_view();
   if (!custom_launcher_page_view)
     return;
 
   bounds = app_list_main_view_->contents_view()
                ->custom_page_view()
@@ skipping 128 matching lines @@
   // is enabled).
   if (event->type() == ui::ET_SCROLL && event->y_offset() < 0)
     MaybeOpenCustomLauncherPage();
 }
 
 TileItemView* StartPageView::GetTileItemView(size_t index) {
   return tiles_container_->GetTileItemView(index);
 }
 
 }  // namespace app_list