Animate the App List overlay when dialogs are opened

ui/app_list/views/app_list_view.cc

 // Copyright (c) 2012 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 "ui/app_list/views/app_list_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
@@ skipping 86 matching lines @@
   }
 
  private:
   const int corner_radius_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListOverlayBackground);
 };
 
 }  // namespace
 
-// An animation observer to hide the view at the end of the animation.
+// An animation observer to hide a set of views at the end of the animation.
 class HideViewAnimationObserver : public ui::ImplicitAnimationObserver {
  public:
-  HideViewAnimationObserver()
-      : frame_(NULL),
-        target_(NULL) {
-  }
+  HideViewAnimationObserver() : frame_(NULL) {}
 
   virtual ~HideViewAnimationObserver() {
-    if (target_)
+    if (targets_.empty())
       StopObservingImplicitAnimations();
   }
 
-  void SetTarget(views::View* target) {
-    if (!target_)
+  void AddTarget(views::View* target) {
+    if (target)
+      targets_.push_back(target);
+
+    if (targets_.empty())
       StopObservingImplicitAnimations();
-    target_ = target;
   }
 
   void set_frame(views::BubbleFrameView* frame) { frame_ = frame; }
 
  private:
   // Overridden from ui::ImplicitAnimationObserver:
   virtual void OnImplicitAnimationsCompleted() OVERRIDE {
-    if (target_) {
-      target_->SetVisible(false);
-      target_ = NULL;
+    for (size_t i = 0; i < targets_.size(); i++)
+      targets_[i]->SetVisible(false);
 
-      // Should update the background by invoking SchedulePaint().
+    // Should update the background by invoking SchedulePaint().
+    if (!targets_.empty())
       frame_->SchedulePaint();
-    }
+
+    targets_.clear();
   }
 
   views::BubbleFrameView* frame_;
-  views::View* target_;
+  std::vector<views::View*> targets_;
 
   DISALLOW_COPY_AND_ASSIGN(HideViewAnimationObserver);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListView:
 
 AppListView::AppListView(AppListViewDelegate* delegate)
     : delegate_(delegate),
       app_list_main_view_(NULL),
@@ skipping 62 matching lines @@
   app_list_main_view_->Close();
   delegate_->Dismiss();
 }
 
 void AppListView::UpdateBounds() {
   SizeToContents();
 }
 
 void AppListView::SetAppListOverlayVisible(bool visible) {
   DCHECK(overlay_view_);
-  overlay_view_->SetVisible(visible);
+
+  // Display the overlay immediately so we can begin the animation.
+  overlay_view_->SetVisible(true);
+
+  ui::ScopedLayerAnimationSettings settings(
+      overlay_view_->layer()->GetAnimator());
+  settings.SetTweenType(gfx::Tween::LINEAR);
+
+  // If we're dismissing the overlay, hide the view at the end of the animation.
+  if (visible == false) {

[calamity, 2014/08/04 03:33:47]

Use !x over 'x == false'.

[sashab, 2014/08/04 05:39:16]

Done.

+    animation_observer_->set_frame(GetBubbleFrameView());

[calamity, 2014/08/04 03:33:47]

Does the background need to repaint? If not, pass NULL and handle !frame_ in the
animation observer.

[sashab, 2014/08/04 05:39:16]

Done.

+    animation_observer_->AddTarget(overlay_view_);
+    settings.AddObserver(animation_observer_.get());
+  }
+
+  const float kOverlayFadeInMilliseconds = 125;
+  settings.SetTransitionDuration(
+      base::TimeDelta::FromMilliseconds(kOverlayFadeInMilliseconds));
+
+  const float kOverlayOpacity = 0.75f;
+  overlay_view_->layer()->SetOpacity(visible ? kOverlayOpacity : 0.0f);
 }
 
 bool AppListView::ShouldCenterWindow() const {
   return delegate_->ShouldCenterWindow();
 }
 
 gfx::Size AppListView::GetPreferredSize() const {
   return app_list_main_view_->GetPreferredSize();
 }
 
@@ skipping 124 matching lines @@
   // to be shown independently in odd situations. Explicitly hide the bubble
   // widget to ensure that any WM_WINDOWPOSCHANGED messages triggered by the
   // window manager do not have the SWP_SHOWWINDOW flag set which would cause
   // the border to be shown. See http://crbug.com/231687 .
   GetWidget()->Hide();
 #endif
 
   // To make the overlay view, construct a view with a white background, rather
   // than a white rectangle in it. This is because we need overlay_view_ to be
   // drawn to its own layer (so it appears correctly in the foreground).
-  const float kOverlayOpacity = 0.75f;
   overlay_view_ = new views::View();
   overlay_view_->SetPaintToLayer(true);
-  overlay_view_->layer()->SetOpacity(kOverlayOpacity);
   overlay_view_->SetBoundsRect(GetContentsBounds());
   overlay_view_->SetVisible(false);
+  overlay_view_->layer()->SetOpacity(0.0f);
   // On platforms that don't support a shadow, the rounded border of the app
   // list is constructed _inside_ the view, so a rectangular background goes
   // over the border in the rounded corners. To fix this, give the background a
   // corner radius 1px smaller than the outer border, so it just reaches but
   // doesn't cover it.
   const int kOverlayCornerRadius =
       GetBubbleFrameView()->bubble_border()->GetBorderCornerRadius();
   overlay_view_->set_background(new AppListOverlayBackground(
       kOverlayCornerRadius - (SupportsShadow() ? 0 : 1)));
   AddChildView(overlay_view_);
@@ skipping 149 matching lines @@
   gfx::Transform speech_transform;
   speech_transform.Translate(
       0, SkFloatToMScalar(kSpeechUIAppearingPosition));
   if (will_appear)
     speech_view_->layer()->SetTransform(speech_transform);
 
   {
     ui::ScopedLayerAnimationSettings main_settings(
         app_list_main_view_->layer()->GetAnimator());
     if (will_appear) {
-      animation_observer_->SetTarget(app_list_main_view_);
+      animation_observer_->AddTarget(app_list_main_view_);
       main_settings.AddObserver(animation_observer_.get());
     }
     app_list_main_view_->layer()->SetOpacity(will_appear ? 0.0f : 1.0f);
   }
 
   {
     ui::ScopedLayerAnimationSettings speech_settings(
         speech_view_->layer()->GetAnimator());
     if (!will_appear) {
-      animation_observer_->SetTarget(speech_view_);
+      animation_observer_->AddTarget(speech_view_);
       speech_settings.AddObserver(animation_observer_.get());
     }
 
     speech_view_->layer()->SetOpacity(will_appear ? 1.0f : 0.0f);
     if (will_appear)
       speech_view_->layer()->SetTransform(gfx::Transform());
     else
       speech_view_->layer()->SetTransform(speech_transform);
   }
 
   if (will_appear)
     speech_view_->SetVisible(true);
   else
     app_list_main_view_->SetVisible(true);
 }
 
 }  // namespace app_list