Replace AllAppsTileItemView with ArrowExpandView

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/expand_arrow_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"
@@ skipping 17 matching lines @@
 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;
+constexpr int kExpandArrowTopPadding = 28;
 
 constexpr int kLauncherPageBackgroundWidth = 400;
 
 }  // namespace
 
 class CustomLauncherPageBackgroundView : public views::View {
  public:
   explicit CustomLauncherPageBackgroundView(
       const std::string& custom_launcher_page_name)
       : selected_(false),
@@ skipping 178 matching lines @@
         new SearchResultTileItemView(this, view_delegate_);
     if (i % kNumStartPageTilesCols == 0)
       tiles_layout_manager->StartRow(0, 0);
     tiles_layout_manager->AddView(tile_item);
     AddChildView(tile_item);
     tile_item->SetParentBackgroundColor(kLabelBackgroundColor);
     tile_item->SetHoverStyle(TileItemView::HOVER_STYLE_ANIMATE_SHADOW);
     search_result_tile_views_.emplace_back(tile_item);
   }
 
-  all_apps_button_->UpdateIcon();
-  if (features::IsFullscreenAppListEnabled()) {
-    // Also add a special "all apps" button to the middle of the next row of the
-    // container.
-    tiles_layout_manager->StartRow(0, 0);
-    tiles_layout_manager->SkipColumns(kCenterColumnOfStartPageAppGrid);
-  } else {
+  if (!features::IsFullscreenAppListEnabled()) {
+    all_apps_button_->UpdateIcon();
     // Also add a special "all apps" button to the end of the next row of the
     // container.
     if (i % kNumStartPageTilesCols == 0)
       tiles_layout_manager->StartRow(0, 0);
+
+    tiles_layout_manager->AddView(all_apps_button_);
+    AddChildView(all_apps_button_);
   }
-
-  tiles_layout_manager->AddView(all_apps_button_);
-  AddChildView(all_apps_button_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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()),
@@ skipping 16 matching lines @@
   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_);
+  if (is_fullscreen_app_list_enabled_) {
+    expand_arrow_view_ = new ExpandArrowView(
+        app_list_main_view_->contents_view(), app_list_view);
+    AddChildView(expand_arrow_view_);
+  }
   AddChildView(custom_launcher_page_background_);
 
   tiles_container_->SetResults(view_delegate_->GetModel()->results());
 }
 
 StartPageView::~StartPageView() = default;
 
 void StartPageView::InitInstantContainer() {
   views::BoxLayout* instant_layout_manager = new views::BoxLayout(
       views::BoxLayout::kVertical, gfx::Insets(), kInstantContainerSpacing);
@@ skipping 95 matching lines @@
     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);
 
+  if (expand_arrow_view_) {
+    gfx::Rect expand_arrow_rect(bounds);
+    int left_right_padding =
+        (bounds.width() - expand_arrow_view_->GetPreferredSize().width()) / 2;
+
+    expand_arrow_rect.Inset(left_right_padding,
+                            bounds.height() + kExpandArrowTopPadding,
+                            left_right_padding, 0);
+    expand_arrow_rect.set_height(
+        expand_arrow_view_->GetPreferredSize().height());
+    expand_arrow_view_->SetBoundsRect(expand_arrow_rect);
+  }
+
   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()
                ->GetCollapsedLauncherPageBounds();
   bounds.Intersect(GetContentsBounds());
   bounds.ClampToCenteredSize(
@@ skipping 125 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