Tablet WM : Swiping on system tray bubble.

ash/system/tray/system_tray_bubble.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 "ash/system/tray/system_tray_bubble.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/tray/tray_constants.h"
+#include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 33 matching lines @@
   }
 
  private:
   std::unique_ptr<ui::Layer> layer_;
 
   DISALLOW_COPY_AND_ASSIGN(AnimationObserverDeleteLayer);
 };
 
 }  // namespace
 
+// CloseBubbleObserver is used to delay closing the system tray bubble until the
+// animation completes.
+class CloseBubbleObserver : public ui::ImplicitAnimationObserver {
+ public:
+  explicit CloseBubbleObserver(SystemTrayBubble* system_tray_bubble)
+      : system_tray_bubble_(system_tray_bubble) {}
+
+  ~CloseBubbleObserver() override {}
+
+  void OnImplicitAnimationsCompleted() override {
+    system_tray_bubble_->Close();
+    delete this;
+  }
+
+ private:
+  SystemTrayBubble* system_tray_bubble_ = nullptr;
+
+  DISALLOW_COPY_AND_ASSIGN(CloseBubbleObserver);
+};
+
 // SystemTrayBubble
 
 SystemTrayBubble::SystemTrayBubble(
     ash::SystemTray* tray,
     const std::vector<ash::SystemTrayItem*>& items,
     BubbleType bubble_type)
     : tray_(tray),
       bubble_view_(nullptr),
       items_(items),
       bubble_type_(bubble_type),
@@ skipping 109 matching lines @@
                                 TrayBubbleView::InitParams* init_params) {
   DCHECK(anchor);
   DCHECK(!bubble_view_);
 
   if (bubble_type_ == BUBBLE_TYPE_DETAILED &&
       init_params->max_height < GetDetailedBubbleMaxHeight()) {
     init_params->max_height = GetDetailedBubbleMaxHeight();
   }
 
   init_params->delegate = tray_;
-  // Place the bubble on same display as this system tray.
-  init_params->parent_window = tray_->GetBubbleWindowContainer();
+  // Place the bubble on same display as this system tray if it is not on
+  // maximize mode. Otherwise, create an clipping window to hold the system
+  // bubble. And place the clipping window on the same display as the system
+  // tray.
+  if (Shell::Get()
+          ->maximize_mode_controller()
+          ->IsMaximizeModeWindowManagerEnabled()) {
+    if (!clipping_window_.get()) {
+      clipping_window_ =
+          std::unique_ptr<aura::Window>(new aura::Window(nullptr));
+      clipping_window_->Init(ui::LAYER_NOT_DRAWN);
+      clipping_window_->layer()->SetMasksToBounds(true);
+      tray_->GetBubbleWindowContainer()->AddChild(clipping_window_.get());
+      clipping_window_->Show();
+    }
+    clipping_window_->SetBounds(tray_->GetWorkAreaBoundsInScreen());
+    init_params->parent_window = clipping_window_.get();
+  } else {
+    init_params->parent_window = tray_->GetBubbleWindowContainer();
+  }
+
   init_params->anchor_view = anchor;
   bubble_view_ = new TrayBubbleView(*init_params);
   UpdateBottomPadding();
   bubble_view_->set_adjust_if_offscreen(false);
   CreateItemViews(login_status);
 
   if (bubble_view_->CanActivate()) {
     bubble_view_->NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
   }
 }
@@ skipping 79 matching lines @@
   for (const std::pair<SystemTrayItem::UmaType, views::View*>& pair :
        tray_item_view_map_) {
     if (pair.second->visible() &&
         pair.first != SystemTrayItem::UMA_NOT_RECORDED) {
       UMA_HISTOGRAM_ENUMERATION("Ash.SystemMenu.DefaultView.VisibleRows",
                                 pair.first, SystemTrayItem::UMA_COUNT);
     }
   }
 }
 
+void SystemTrayBubble::UpdateBounds(const gfx::Rect& target_bounds,

[tdanderson, 2017/06/20 22:42:29]

For clarity, how about naming this AnimateToTargetBounds() (or similar)?

[minch1, 2017/06/22 17:42:11]

Done.

+                                    bool close_bubble) {
+  const int kAnimationDurationMS = 200;
+
+  ui::ScopedLayerAnimationSettings settings(
+      bubble_view()->GetWidget()->GetNativeView()->layer()->GetAnimator());
+  settings.SetTransitionDuration(
+      base::TimeDelta::FromMilliseconds(kAnimationDurationMS));
+  settings.SetTweenType(gfx::Tween::EASE_OUT);
+  settings.SetPreemptionStrategy(
+      ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+  if (close_bubble)
+    settings.AddObserver(new CloseBubbleObserver(this));
+  bubble_view()->GetWidget()->SetBounds(target_bounds);
+}
+
 void SystemTrayBubble::UpdateBottomPadding() {
   if (bubble_type_ == BUBBLE_TYPE_DEFAULT)
     bubble_view_->SetBottomPadding(kDefaultViewBottomPadding);
   else
     bubble_view_->SetBottomPadding(0);
 }
 
 void SystemTrayBubble::CreateItemViews(LoginStatus login_status) {
   tray_item_view_map_.clear();
 
@@ skipping 23 matching lines @@
     }
   }
 
   if (focus_view) {
     tray_->ActivateBubble();
     focus_view->RequestFocus();
   }
 }
 
 }  // namespace ash