applist: Translate and fade launcher when swipe up to minimize.

Refactor the launcher overview animation to share some code.

Test: manual
Bug: 873394
Change-Id: I6c94719a559eea04e354d2bc131efc4cf14650df
Reviewed-on: https://chromium-review.googlesource.com/1196910Reviewed-by: Weidong Guo <weidongg@chromium.org>
Commit-Queue: Sammie Quon <sammiequon@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587794}

ash/app_list/app_list_controller_impl.cc

@@ -75,7 +75,7 @@ AppListControllerImpl::AppListControllerImpl(ws::WindowService* window_service)
   if (is_home_launcher_enabled_ &&
       app_list::features::IsHomeLauncherGesturesEnabled()) {
     home_launcher_gesture_handler_ =
-        std::make_unique<HomeLauncherGestureHandler>();
+        std::make_unique<HomeLauncherGestureHandler>(this);
   }
 
   mojom::VoiceInteractionObserverPtr ptr;

ash/app_list/home_launcher_gesture_handler.cc

@@ -5,6 +5,7 @@
 #include "ash/app_list/home_launcher_gesture_handler.h"
 
 #include "ash/app_list/app_list_controller_impl.h"
+#include "ash/app_list/model/app_list_view_state.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/wm/mru_window_tracker.h"
@@ -84,6 +85,13 @@ double GetHeightInWorkAreaAsRatio(int y, aura::Window* window) {
   return 1.0 - ratio;
 }
 
+void UpdateSettings(ui::ScopedLayerAnimationSettings* settings) {
+  settings->SetTransitionDuration(kAnimationDurationMs);
+  settings->SetTweenType(gfx::Tween::LINEAR);
+  settings->SetPreemptionStrategy(
+      ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+}
+
 // Helper class to perform window state changes without animations. Used to hide
 // and minimize windows without having their animation interfere with the ones
 // this class is in charge of.
@@ -109,7 +117,9 @@ class ScopedAnimationDisabler {
 
 }  // namespace
 
-HomeLauncherGestureHandler::HomeLauncherGestureHandler() {
+HomeLauncherGestureHandler::HomeLauncherGestureHandler(
+    AppListControllerImpl* app_list_controller)
+    : app_list_controller_(app_list_controller) {
   tablet_mode_observer_.Add(Shell::Get()->tablet_mode_controller());
 }
 
@@ -257,6 +267,11 @@ void HomeLauncherGestureHandler::OnImplicitAnimationsCompleted() {
     }
   }
 
+  // Return the app list to its original opacity and transform without
+  // animation.
+  app_list_controller_->presenter()->UpdateYPositionAndOpacityForHomeLauncher(
+      screen_util::GetDisplayWorkAreaBoundsInParent(window_).y(), 1.f,
+      base::NullCallback());
   last_event_location_ = base::nullopt;
   RemoveObserversAndStopTracking();
 }
@@ -264,10 +279,14 @@ void HomeLauncherGestureHandler::OnImplicitAnimationsCompleted() {
 bool HomeLauncherGestureHandler::CanHideWindow(aura::Window* window) {
   DCHECK(window);
 
+  // Window should not be fullscreen as we do not allow swiping up when auto
+  // hide for shelf.
+  DCHECK(!wm::GetWindowState(window)->IsFullscreen());
+
   if (!window->IsVisible())
     return false;
 
-  if (!Shell::Get()->app_list_controller()->IsHomeLauncherEnabledInTabletMode())
+  if (!app_list_controller_->IsHomeLauncherEnabledInTabletMode())
     return false;
 
   if (Shell::Get()->split_view_controller()->IsSplitViewModeActive())
@@ -301,10 +320,7 @@ void HomeLauncherGestureHandler::UpdateWindows(double progress, bool animate) {
     if (animate) {
       settings = std::make_unique<ui::ScopedLayerAnimationSettings>(
           window->layer()->GetAnimator());
-      settings->SetTransitionDuration(kAnimationDurationMs);
-      settings->SetTweenType(gfx::Tween::LINEAR);
-      settings->SetPreemptionStrategy(
-          ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+      UpdateSettings(settings.get());
       if (window == this->window())
         settings->AddObserver(this);
     }
@@ -317,6 +333,22 @@ void HomeLauncherGestureHandler::UpdateWindows(double progress, bool animate) {
                           descendant.second);
   }
   update_windows_helper(progress, animate, window_, window_values_);
+
+  // Update full screen applist. On tests, |window_| may be null because
+  // OnImplicitAnimationsCompleted runs right away, which invalidates |window_|,
+  // so just skip this section.
+  if (!window_)
+    return;
+
+  const gfx::Rect work_area =
+      screen_util::GetDisplayWorkAreaBoundsInParent(window_);
+  const int y_position =
+      gfx::Tween::IntValueBetween(progress, work_area.bottom(), work_area.y());
+  app_list_controller_->presenter()->UpdateYPositionAndOpacityForHomeLauncher(
+      y_position,
+      gfx::Tween::FloatValueBetween(progress, window_values_.target_opacity,
+                                    window_values_.initial_opacity),
+      animate ? base::BindRepeating(&UpdateSettings) : base::NullCallback());
 }
 
 void HomeLauncherGestureHandler::RemoveObserversAndStopTracking() {

ash/app_list/home_launcher_gesture_handler.h

@@ -22,6 +22,8 @@
 
 namespace ash {
 
+class AppListControllerImpl;
+
 // HomeLauncherGestureHandler makes modifications to a window's transform and
 // opacity when gesture drag events are received and forwarded to it.
 // Additionally hides windows which may block the home launcher. All
@@ -31,7 +33,8 @@ class ASH_EXPORT HomeLauncherGestureHandler : aura::WindowObserver,
                                               TabletModeObserver,
                                               ui::ImplicitAnimationObserver {
  public:
-  HomeLauncherGestureHandler();
+  explicit HomeLauncherGestureHandler(
+      AppListControllerImpl* app_list_controller);
   ~HomeLauncherGestureHandler() override;
 
   // Called by owner of this object when a gesture event is received. |location|
@@ -96,6 +99,9 @@ class ASH_EXPORT HomeLauncherGestureHandler : aura::WindowObserver,
   ScopedObserver<TabletModeController, TabletModeObserver>
       tablet_mode_observer_{this};
 
+  // Unowned and guaranteed to be non null for the lifetime of this.
+  AppListControllerImpl* app_list_controller_;
+
   DISALLOW_COPY_AND_ASSIGN(HomeLauncherGestureHandler);
 };
 

ash/app_list/presenter/app_list_presenter_impl.cc

@@ -32,21 +32,40 @@ namespace app_list {
 namespace {
 
 // The y offset for app list animation when overview mode toggles.
-constexpr int kOverViewAnimationYOffset = 100;
+constexpr int kOverviewAnimationYOffset = 100;
 
 // The delay in milliseconds for app list animation when overview mode ends
-constexpr base::TimeDelta kOverViewEndAnimationDelay =
+constexpr base::TimeDelta kOverviewEndAnimationDelay =
     base::TimeDelta::FromMilliseconds(250);
 
 // The duration in milliseconds for app list animation when overview mode
 // toggles.
-constexpr base::TimeDelta kOverViewAnimationDuration =
+constexpr base::TimeDelta kOverviewAnimationDuration =
     base::TimeDelta::FromMilliseconds(250);
 
 inline ui::Layer* GetLayer(views::Widget* widget) {
   return widget->GetNativeView()->layer();
 }
 
+void UpdateOverviewSettings(bool end_overview,
+                            ui::AnimationMetricsReporter* reporter,
+                            ui::ScopedLayerAnimationSettings* settings) {
+  settings->SetTransitionDuration(kOverviewAnimationDuration);
+  settings->SetTweenType(gfx::Tween::FAST_OUT_SLOW_IN);
+  settings->SetPreemptionStrategy(
+      ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+
+  DCHECK(reporter);
+  settings->SetAnimationMetricsReporter(reporter);
+
+  if (end_overview) {
+    settings->GetAnimator()->SchedulePauseForProperties(
+        kOverviewEndAnimationDelay,
+        ui::LayerAnimationElement::AnimatableProperty::OPACITY |
+            ui::LayerAnimationElement::AnimatableProperty::TRANSFORM);
+  }
+}
+
 class StateAnimationMetricsReporter : public ui::AnimationMetricsReporter {
  public:
   StateAnimationMetricsReporter() = default;
@@ -213,71 +232,46 @@ void AppListPresenterImpl::ProcessMouseWheelOffset(int y_scroll_offset) {
     view_->HandleScroll(y_scroll_offset, ui::ET_MOUSEWHEEL);
 }
 
-void AppListPresenterImpl::ScheduleOverviewModeAnimation(bool start,
-                                                         bool animate) {
-  if (ui::ScopedAnimationDurationScaleMode::duration_scale_mode() ==
-      ui::ScopedAnimationDurationScaleMode::ZERO_DURATION) {
-    // Start animation immediately in test.
-    StartOverviewModeAnimation(start, false);
-    return;
-  }
-
-  start_animation_timer_.Stop();
-  start_animation_timer_.Start(
-      FROM_HERE, start ? base::TimeDelta() : kOverViewEndAnimationDelay,
-      base::BindOnce(&AppListPresenterImpl::StartOverviewModeAnimation,
-                     base::Unretained(this), start, animate));
-}
-
-void AppListPresenterImpl::StartOverviewModeAnimation(bool start,
-                                                      bool animate) {
+void AppListPresenterImpl::UpdateYPositionAndOpacityForHomeLauncher(
+    int y_position_in_screen,
+    float opacity,
+    UpdateHomeLauncherAnimationSettingsCallback callback) {
   if (!GetTargetVisibility())
     return;
 
-  // Calculate the source and target parameters used in the animation.
-  gfx::Transform transform;
-  transform.Translate(0, kOverViewAnimationYOffset);
-  const base::TimeDelta duration =
-      animate ? kOverViewAnimationDuration : base::TimeDelta();
-  const gfx::Transform source_transform = start ? gfx::Transform() : transform;
-  const gfx::Transform target_transform = start ? transform : gfx::Transform();
-  const float source_opacity = start ? 1.0f : 0.0f;
-  const float target_opacity = start ? 0.0f : 1.0f;
-
-  // Start animation to change the opacity and y position of expand arrow,
-  // suggestion chips and apps grid.
-  AppListMainView* app_list_main_view = view_->app_list_main_view();
-  ui::Layer* layer = app_list_main_view->layer();
-  layer->GetAnimator()->StopAnimating();
-  layer->SetTransform(source_transform);
-  layer->SetOpacity(source_opacity);
-
-  {
-    ui::ScopedLayerAnimationSettings animation(layer->GetAnimator());
-    animation.SetTransitionDuration(duration);
-    animation.SetTweenType(gfx::Tween::FAST_OUT_SLOW_IN);
-    animation.SetAnimationMetricsReporter(
-        state_animation_metrics_reporter_.get());
-    layer->SetTransform(target_transform);
-    layer->SetOpacity(target_opacity);
+  const gfx::Transform translation(1.f, 0.f, 0.f, 1.f, 0.f,
+                                   static_cast<float>(y_position_in_screen));
+  // We want to animate the expand arrow, suggestion chips and apps grid in
+  // app_list_main_view, and the search box.
+  std::vector<ui::Layer*> animation_layers = {
+      view_->app_list_main_view()->layer(),
+      view_->search_box_widget()->GetNativeWindow()->layer()};
+  for (auto* layer : animation_layers) {
+    layer->GetAnimator()->StopAnimating();
+    std::unique_ptr<ui::ScopedLayerAnimationSettings> settings;
+    if (!callback.is_null()) {
+      settings = std::make_unique<ui::ScopedLayerAnimationSettings>(
+          layer->GetAnimator());
+      callback.Run(settings.get());
+    }
+    layer->SetOpacity(opacity);
+    layer->SetTransform(translation);
   }
+}
 
-  // Start animation to change the opacity and y position of search box.
-  views::Widget* search_box_widget = view_->search_box_widget();
-  ui::Layer* search_box_layer = search_box_widget->GetNativeView()->layer();
-  search_box_layer->GetAnimator()->StopAnimating();
-  search_box_layer->SetTransform(source_transform);
-  search_box_layer->SetOpacity(source_opacity);
-
-  {
-    ui::ScopedLayerAnimationSettings animation(search_box_layer->GetAnimator());
-    animation.SetTransitionDuration(duration);
-    animation.SetTweenType(gfx::Tween::FAST_OUT_SLOW_IN);
-    animation.SetAnimationMetricsReporter(
-        state_animation_metrics_reporter_.get());
-    search_box_layer->SetTransform(target_transform);
-    search_box_layer->SetOpacity(target_opacity);
+void AppListPresenterImpl::ScheduleOverviewModeAnimation(bool start,
+                                                         bool animate) {
+  // If animating, set the source parameters.
+  if (animate) {
+    UpdateYPositionAndOpacityForHomeLauncher(
+        start ? 0 : kOverviewAnimationYOffset, start ? 1.f : 0.f,
+        base::NullCallback());
   }
+  UpdateYPositionAndOpacityForHomeLauncher(
+      start ? kOverviewAnimationYOffset : 0, start ? 0.f : 1.f,
+      animate ? base::BindRepeating(&UpdateOverviewSettings, start,
+                                    state_animation_metrics_reporter_.get())
+              : base::NullCallback());
 }
 
 ////////////////////////////////////////////////////////////////////////////////

ash/app_list/presenter/app_list_presenter_impl.h

@@ -13,9 +13,9 @@
 #include "ash/app_list/pagination_model_observer.h"
 #include "ash/app_list/presenter/app_list_presenter_delegate.h"
 #include "ash/app_list/presenter/app_list_presenter_export.h"
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "base/timer/timer.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/compositor/layer_animation_observer.h"
@@ -39,6 +39,12 @@ class APP_LIST_PRESENTER_EXPORT AppListPresenterImpl
       public views::WidgetObserver,
       public PaginationModelObserver {
  public:
+  // Callback which fills out the passed settings object. Used by
+  // UpdateYPositionAndOpacityForHomeLauncher so different callers can do
+  // similar animations with different settings.
+  using UpdateHomeLauncherAnimationSettingsCallback =
+      base::RepeatingCallback<void(ui::ScopedLayerAnimationSettings* settings)>;
+
   explicit AppListPresenterImpl(
       std::unique_ptr<AppListPresenterDelegate> delegate);
   ~AppListPresenterImpl() override;
@@ -85,13 +91,16 @@ class APP_LIST_PRESENTER_EXPORT AppListPresenterImpl
   // Passes a MouseWheelEvent from the shelf to the AppListView.
   void ProcessMouseWheelOffset(int y_scroll_offset);
 
-  // Schedules animation for app list when overview mode starts or ends. The
-  // animation duration will be set to 0 if |animate| is false.
-  void ScheduleOverviewModeAnimation(bool start, bool animate);
+  // Updates the y position and opacity of the full screen app list. The changes
+  // are slightly different than UpdateYPositionAndOpacity. If |callback| is non
+  // null the this will animate using the animation settings in |callback|.
+  void UpdateYPositionAndOpacityForHomeLauncher(
+      int y_position_in_screen,
+      float opacity,
+      UpdateHomeLauncherAnimationSettingsCallback callback);
 
-  // Immediately start animation for app list when overview mode starts or ends.
-  // The animation duration will be set to 0 if |animate| is false.
-  void StartOverviewModeAnimation(bool start, bool animate);
+  // Schedules animation for app list when overview mode starts or ends.
+  void ScheduleOverviewModeAnimation(bool start, bool animate);
 
  private:
   // Sets the app list view and attempts to show it.
@@ -160,9 +169,6 @@ class APP_LIST_PRESENTER_EXPORT AppListPresenterImpl
   bool last_visible_ = false;
   int64_t last_display_id_ = display::kInvalidDisplayId;
 
-  // The timer used to delay the start time of an animation.
-  base::OneShotTimer start_animation_timer_;
-
   DISALLOW_COPY_AND_ASSIGN(AppListPresenterImpl);
 };