Cros: Scale folder dropping circle to icon scale

When the apps grid enters cardified state, all icons are scaled down
84%. We need to scale down the folder circle proportionally, to avoid
clipping at the top edges.

Bug: 1108644
Change-Id: I95b97d6d3db15c0313a92bbffbd5f70ffb4e071e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2315094Reviewed-by: Toni Baržić <tbarzic@chromium.org>
Commit-Queue: Ana Salazar <anasalazar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791998}

ash/app_list/views/app_list_item_view.cc

@@ -886,7 +886,7 @@ void AppListItemView::AnimationProgressed(const gfx::Animation* animation) {
 
   preview_circle_radius_ = gfx::Tween::IntValueBetween(
       animation->GetCurrentValue(), 0,
-      GetAppListConfig().folder_dropping_circle_radius());
+      GetAppListConfig().folder_dropping_circle_radius() * icon_scale_);
   SchedulePaint();
 }
 

ash/app_list/views/apps_grid_view.cc

@@ -1706,7 +1706,8 @@ bool AppsGridView::DragPointIsOverItem(const gfx::Point& point) {
       (point - GetExpectedTileBounds(nearest_tile_index).CenterPoint())
           .Length();
   if (distance_to_tile_center >
-      GetAppListConfig().folder_dropping_circle_radius()) {
+      (GetAppListConfig().folder_dropping_circle_radius() *
+       (cardified_state_ ? kCardifiedScale : 1.0f))) {
     return false;
   }
 
@@ -1744,7 +1745,8 @@ void AppsGridView::UpdateDropTargetForReorder(const gfx::Point& point) {
   // between apps.
   int x_offset =
       x_offset_direction * (total_tile_size.width() / 2 -
-                            GetAppListConfig().folder_dropping_circle_radius());
+                            GetAppListConfig().folder_dropping_circle_radius() *
+                                (cardified_state_ ? kCardifiedScale : 1.0f));
   int col = (point.x() - bounds.x() + x_offset) / total_tile_size.width();
   col = base::ClampToRange(col, 0, cols_ - 1);
   drop_target_ =
@@ -1781,7 +1783,8 @@ bool AppsGridView::DragIsCloseToItem() {
       (GetAppListConfig().grid_tile_width() + horizontal_tile_padding_ * 2) *
       0.4;
   const int double_icon_radius =
-      GetAppListConfig().folder_dropping_circle_radius() * 2;
+      GetAppListConfig().folder_dropping_circle_radius() * 2 *
+      (cardified_state_ ? kCardifiedScale : 1.0f);
   const int minimum_drag_distance_for_reorder =
       std::min(forty_percent_icon_spacing, double_icon_radius);