Add margin between items in folder icon to AppListConfig

The margin for small config is different than other (2 instead of 4), so
it cannot be just hardcoded in folder_image.

Updates how item image offset from the center of the folder icon is
calculated to 1/2 (item icon size + item margin), which matches the new
spec.

It's little different from the existing logic, where the item icon is
inset by 2 dip from the folder icon edge, but the numbers match for the
current (kShared) config.

BUG=996808

Change-Id: I4b5ffab257055d89ec612e60076af6cf6e24f841
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1779668Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Toni Baržić <tbarzic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692849}

ash/app_list/model/folder_image.cc

@@ -26,9 +26,6 @@ namespace app_list {
 
 namespace {
 
-// The margin of item icon in folder icon.
-constexpr int kItemIconMargin = 2;
-
 // The shadow blur of icon.
 constexpr int kIconShadowBlur = 5;
 
@@ -189,10 +186,10 @@ std::vector<gfx::Rect> FolderImage::GetTopIconsBounds(
                               icon_center.y() - item_icon_dimension / 2,
                               item_icon_dimension, item_icon_dimension);
 
-  const int origin_offset = (AppListConfig::instance().folder_icon_dimension() -
-                             item_icon_dimension) /
-                                2 -
-                            kItemIconMargin;
+  const int origin_offset =
+      (item_icon_dimension +
+       AppListConfig::instance().item_icon_in_folder_icon_margin()) /
+      2;
 
   const int scaled_folder_unclipped_icon_dimension =
       app_list_config.folder_unclipped_icon_dimension();

ash/public/cpp/app_list/app_list_config.cc

@@ -225,7 +225,7 @@ int FolderClippedIconDimensionForType(ash::AppListConfigType type) {
   return FolderClippedIconDimensionForType(ash::AppListConfigType::kShared);
 }
 
-int ItemIconInFolderDimensionForType(ash::AppListConfigType type) {
+int ItemIconInFolderIconDimensionForType(ash::AppListConfigType type) {
   switch (type) {
     case ash::AppListConfigType::kShared:
     case ash::AppListConfigType::kLarge:
@@ -237,7 +237,21 @@ int ItemIconInFolderDimensionForType(ash::AppListConfigType type) {
   }
 
   NOTREACHED();
-  return ItemIconInFolderDimensionForType(ash::AppListConfigType::kShared);
+  return ItemIconInFolderIconDimensionForType(ash::AppListConfigType::kShared);
+}
+
+int ItemIconInFolderIconMarginForType(ash::AppListConfigType type) {
+  switch (type) {
+    case ash::AppListConfigType::kShared:
+    case ash::AppListConfigType::kLarge:
+    case ash::AppListConfigType::kMedium:
+      return 4;
+    case ash::AppListConfigType::kSmall:
+      return 2;
+  }
+
+  NOTREACHED();
+  return ItemIconInFolderIconMarginForType(ash::AppListConfigType::kShared);
 }
 
 }  // namespace
@@ -288,7 +302,8 @@ AppListConfig::AppListConfig(ash::AppListConfigType type)
       folder_background_radius_(12),
       folder_bubble_color_(SkColorSetA(gfx::kGoogleGrey100, 0x7A)),
       item_icon_in_folder_icon_dimension_(
-          ItemIconInFolderDimensionForType(type)),
+          ItemIconInFolderIconDimensionForType(type)),
+      item_icon_in_folder_icon_margin_(ItemIconInFolderIconMarginForType(type)),
       folder_dropping_circle_radius_(folder_bubble_radius_),
       folder_dropping_delay_(0),
       folder_background_color_(gfx::kGoogleGrey100),
@@ -397,6 +412,10 @@ AppListConfig::AppListConfig(const AppListConfig& base_config,
           MinScale(base_config.item_icon_in_folder_icon_dimension_,
                    scale_x,
                    inner_tile_scale_y)),
+      item_icon_in_folder_icon_margin_(
+          MinScale(base_config.item_icon_in_folder_icon_margin_,
+                   scale_x,
+                   inner_tile_scale_y)),
       folder_dropping_circle_radius_(
           MinScale(base_config.folder_dropping_circle_radius_,
                    scale_x,

ash/public/cpp/app_list/app_list_config.h

@@ -125,6 +125,9 @@ class ASH_PUBLIC_EXPORT AppListConfig {
   int item_icon_in_folder_icon_dimension() const {
     return item_icon_in_folder_icon_dimension_;
   }
+  int item_icon_in_folder_icon_margin() const {
+    return item_icon_in_folder_icon_margin_;
+  }
   int folder_dropping_circle_radius() const {
     return folder_dropping_circle_radius_;
   }
@@ -338,6 +341,9 @@ class ASH_PUBLIC_EXPORT AppListConfig {
   // The dimension of the item icon in folder icon.
   const int item_icon_in_folder_icon_dimension_;
 
+  // The margin between item icons inside a folder icon.
+  const int item_icon_in_folder_icon_margin_;
+
   // Radius of the circle, in which if entered, show folder dropping preview
   // UI.
   const int folder_dropping_circle_radius_;