cros: Make SearchResultTileItemView layout per DisplayType customized

ui/app_list/views/search_result_tile_item_view.cc

Index: ui/app_list/views/search_result_tile_item_view.cc
diff --git a/ui/app_list/views/search_result_tile_item_view.cc b/ui/app_list/views/search_result_tile_item_view.cc
index eb24b845b1afe6d2a6d93e2710fa74f29210a330..e7db5eab136e194e4cb8d0610a635498e496195a 100644
--- a/ui/app_list/views/search_result_tile_item_view.cc
+++ b/ui/app_list/views/search_result_tile_item_view.cc
@@ -4,19 +4,39 @@
 
 #include "ui/app_list/views/search_result_tile_item_view.h"
 
+#include "ui/app_list/app_list_constants.h"
+#include "ui/app_list/app_list_features.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/search_result.h"
 #include "ui/app_list/views/search_result_container_view.h"
+#include "ui/views/controls/image_view.h"
+#include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 namespace app_list {
 
+namespace {
+
+constexpr int kRecommendationTileWidth = 96;
+constexpr int kRecommendationTileHeight = 99;
+constexpr int kRecommendationIconTopPadding = 24;
+constexpr int kRecommendationTitleSpacing = 10;
+constexpr int kRecommendationTileMaxWidth = 80;
+
+constexpr int kSearchTileTopPadding = 4;
+constexpr int kSearchTitleSpacing = 6;
+
+constexpr SkColor kRecommendationTileColor = SK_ColorWHITE;
+
+}  // namespace
+
 SearchResultTileItemView::SearchResultTileItemView(
     SearchResultContainerView* result_container,
     AppListViewDelegate* view_delegate)
     : result_container_(result_container),
       item_(nullptr),
-      view_delegate_(view_delegate) {
+      view_delegate_(view_delegate),
+      is_fullscreen_app_list_enabled_(features::IsFullscreenAppListEnabled()) {
   // When |item_| is null, the tile is invisible. Calling SetSearchResult with a
   // non-null item makes the tile visible.
   SetVisible(false);
@@ -34,7 +54,7 @@ void SearchResultTileItemView::SetSearchResult(SearchResult* item) {
   // context menu is showing. This cancels the menu (it's for the old item).
   context_menu_runner_.reset();
 
-  SetVisible(item != NULL);
+  SetVisible(!!item);
 
   SearchResult* old_item = item_;
   if (old_item)
@@ -49,10 +69,17 @@ void SearchResultTileItemView::SetSearchResult(SearchResult* item) {
 
   SetTitle(item_->title());
 
+  // Customize title UI
+  gfx::FontList base_font = ui::ResourceBundle::GetSharedInstance().GetFontList(
+      ui::ResourceBundle::BaseFont);
+  if (item_->display_type() == SearchResult::DISPLAY_RECOMMENDATION) {
+    title()->SetFontList(base_font.DeriveWithSizeDelta(1));
+    title()->SetEnabledColor(kRecommendationTileColor);
+  }
+
   // Only refresh the icon if it's different from the old one. This prevents
   // flickering.
-  if (old_item == NULL ||
-      !item->icon().BackedBySameObjectAs(old_item->icon())) {
+  if (!old_item || !item->icon().BackedBySameObjectAs(old_item->icon())) {
     OnIconChanged();
   }
 }
@@ -111,4 +138,48 @@ void SearchResultTileItemView::ShowContextMenuForView(
                                   views::MENU_ANCHOR_TOPLEFT, source_type);
 }
 
+void SearchResultTileItemView::Layout() {
+  gfx::Rect rect(GetContentsBounds());
+  if (rect.IsEmpty())
+    return;
+
+  if (is_fullscreen_app_list_enabled_ && item_) {

[xiyuan, 2017/06/21 18:24:00]

nit: revise to bail early to have less indent.

i.e.

  if (!is_fullscreen_app_list_enabled_ || !item_) {
    TileItemView::Layout();
    return;
  }

  ...

[Qiang(Joe) Xu, 2017/06/21 18:50:12]

Done.

+    if (item_->display_type() == SearchResult::DISPLAY_RECOMMENDATION) {
+      rect.Inset(0, kRecommendationIconTopPadding, 0, 0);
+      icon()->SetBoundsRect(rect);
+
+      rect.Inset(0, kGridIconDimension + kRecommendationTitleSpacing, 0, 0);
+      rect.set_height(title()->GetPreferredSize().height());
+      rect.set_width(kRecommendationTileMaxWidth);
+      title()->SetBoundsRect(rect);
+    } else if (item_->display_type() == SearchResult::DISPLAY_TILE) {
+      rect.Inset(0, kSearchTileTopPadding, 0, 0);
+      icon()->SetBoundsRect(rect);
+      if (badge()) {
+        gfx::Rect badge_rect(rect);
+        gfx::Size icon_size = icon()->GetImage().size();
+        badge_rect.Offset((icon_size.width() - kAppBadgeIconSize) / 2,
+                          icon_size.height() - kBadgeBackgroundRadius -
+                              kAppBadgeIconSize / 2);
+        badge()->SetBoundsRect(badge_rect);
+
+        rect.Inset(0, kGridIconDimension + kSearchTitleSpacing, 0, 0);
+        rect.set_height(title()->GetPreferredSize().height());
+        title()->SetBoundsRect(rect);
+      }
+    }
+  } else {
+    TileItemView::Layout();
+  }
+}
+
+gfx::Size SearchResultTileItemView::CalculatePreferredSize() const {
+  if (is_fullscreen_app_list_enabled_ && item_ &&
+      item_->display_type() == SearchResult::DISPLAY_RECOMMENDATION) {
+    return gfx::Size(kRecommendationTileWidth, kRecommendationTileHeight);
+  }
+
+  return TileItemView::CalculatePreferredSize();
+}
+
 }  // namespace app_list