[ash-md] Adjusts animation of the selector after closing an overview item

ash/common/wm/overview/window_grid.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 "ash/common/wm/overview/window_grid.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/wm/overview/scoped_overview_animation_settings.h"
+#include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h"
 #include "ash/common/wm/overview/scoped_transform_overview_window.h"
 #include "ash/common/wm/overview/window_selector.h"
 #include "ash/common/wm/overview/window_selector_item.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_window.h"
 #include "base/command_line.h"
 #include "base/i18n/string_search.h"
@@ skipping 61 matching lines @@
 
 // Conceptually the window overview is a table or grid of cells having this
 // fixed aspect ratio. The number of columns is determined by maximizing the
 // area of them based on the number of window_list.
 const float kCardAspectRatio = 4.0f / 3.0f;
 
 // The minimum number of cards along the major axis (i.e. horizontally on a
 // landscape orientation).
 const int kMinCardsMajor = 3;
 
-const int kOverviewSelectorTransitionMilliseconds = 200;
+const int kOverviewSelectorTransitionMilliseconds = 250;
 
 // The color and opacity of the screen shield in overview.
 const SkColor kShieldColor = SkColorSetARGB(178, 0, 0, 0);
 
 // The color and opacity of the overview selector.
 const SkColor kWindowSelectionColor = SkColorSetARGB(128, 0, 0, 0);
 const SkColor kWindowSelectionColorMD = SkColorSetARGB(51, 255, 255, 255);
 const SkColor kWindowSelectionBorderColor = SkColorSetARGB(38, 255, 255, 255);
 const SkColor kWindowSelectionBorderColorMD = SkColorSetARGB(76, 255, 255, 255);
 
 // Border thickness of overview selector.
 const int kWindowSelectionBorderThickness = 2;
 const int kWindowSelectionBorderThicknessMD = 1;
 
 // Corner radius of the overview selector border.
 const int kWindowSelectionRadius = 0;
 const int kWindowSelectionRadiusMD = 4;
 
 // The minimum amount of spacing between the bottom of the text filtering
 // text field and the top of the selection widget on the first row of items.
 const int kTextFilterBottomMargin = 5;
 
 // In the conceptual overview table, the window margin is the space reserved
 // around the window within the cell. This margin does not overlap so the
 // closest distance between adjacent windows will be twice this amount.
 const int kWindowMarginMD = 5;
 
-// Additional inset of overview selector (4 is the visible selector thickness).
-const int kSelectionInset = kWindowMarginMD - 5;
-
 // Windows are not allowed to get taller than this.
 const int kMaxHeight = 512;
 
 // Margins reserved in the overview mode.
 const float kOverviewInsetRatio = 0.05f;
 
 // Additional vertical inset reserved for windows in overview mode.
 const float kOverviewVerticalInset = 0.1f;
 
 // A View having rounded corners and a specified background color which is
@@ skipping 584 matching lines @@
     } else {
       (*iter)->SetDimmed(true);
       if (selection_widget_ && SelectedWindow() == *iter) {
         SelectedWindow()->SetSelected(false);
         selection_widget_.reset();
       }
     }
   }
 }
 
+void WindowGrid::WindowClosing(WindowSelectorItem* window) {
+  if (!selection_widget_ || SelectedWindow() != window)
+    return;
+  WmWindow* selection_widget_window =
+      WmLookup::Get()->GetWindowForWidget(selection_widget_.get());
+  std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings_label =
+      ScopedOverviewAnimationSettingsFactory::Get()
+          ->CreateOverviewAnimationSettings(
+              OverviewAnimationType::OVERVIEW_ANIMATION_CLOSING_SELECTOR_ITEM,
+              selection_widget_window);
+  selection_widget_->SetOpacity(0.f);
+}
+
 void WindowGrid::OnWindowDestroying(WmWindow* window) {
   window->RemoveObserver(this);
   observed_windows_.erase(window);
   ScopedVector<WindowSelectorItem>::iterator iter =
       std::find_if(window_list_.begin(), window_list_.end(),
                    WindowSelectorItemComparator(window));
 
   DCHECK(iter != window_list_.end());
 
   size_t removed_index = iter - window_list_.begin();
@@ skipping 114 matching lines @@
   // read.
   SelectedWindow()->SendAccessibleSelectionEvent();
   // The selection widget is moved to the newly selected item in the same
   // grid.
   MoveSelectionWidgetToTarget(animate);
 }
 
 void WindowGrid::MoveSelectionWidgetToTarget(bool animate) {
   gfx::Rect bounds =
       root_window_->ConvertRectFromScreen(SelectedWindow()->target_bounds());
-  if (ash::MaterialDesignController::IsOverviewMaterial())
-    bounds.Inset(kSelectionInset, kSelectionInset);
   if (animate) {
     WmWindow* selection_widget_window =
         WmLookup::Get()->GetWindowForWidget(selection_widget_.get());
     ui::ScopedLayerAnimationSettings animation_settings(
         selection_widget_window->GetLayer()->GetAnimator());
     animation_settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
         kOverviewSelectorTransitionMilliseconds));
-    animation_settings.SetTweenType(gfx::Tween::LINEAR_OUT_SLOW_IN);
+    animation_settings.SetTweenType(
+        ash::MaterialDesignController::IsOverviewMaterial()
+            ? gfx::Tween::EASE_IN_OUT
+            : gfx::Tween::LINEAR_OUT_SLOW_IN);
     animation_settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     selection_widget_->SetBounds(bounds);
     selection_widget_->SetOpacity(1.f);
     return;
   }
   selection_widget_->SetBounds(bounds);
   selection_widget_->SetOpacity(1.f);
 }
 
@@ skipping 58 matching lines @@
         *min_right = left;
       if (*max_right < left)
         *max_right = left;
     }
     *max_bottom = top + height;
   }
   return windows_fit;
 }
 
 }  // namespace ash