Tablet WM : Swiping on system tray bubble.

ash/system/tray/system_tray.cc

Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 78f2929147dab3951ce59e4d5e0d922ef7483b9c..773a6ffded1809c008679aa99132ba47b43d8fc4 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -50,6 +50,7 @@
 #include "ash/system/user/tray_user.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/wm/container_finder.h"
+#include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/widget_finder.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ -172,8 +173,10 @@ class SystemTray::ActivationObserver : public ::wm::ActivationChangeObserver {
     int container_id = wm::GetContainerForWindow(gained_active)->id();
 
     // Don't close the bubble if a popup notification is activated.
-    if (container_id == kShellWindowId_StatusContainer)
+    if (container_id == kShellWindowId_StatusContainer ||
+        container_id == kShellWindowId_SettingBubbleContainer) {
       return;
+    }
 
     views::Widget* bubble_widget =
         tray_->GetSystemBubble()->bubble_view()->GetWidget();
@@ -198,13 +201,21 @@ class SystemTray::ActivationObserver : public ::wm::ActivationChangeObserver {
 
 // SystemTray
 
-SystemTray::SystemTray(Shelf* shelf) : TrayBackgroundView(shelf) {
+SystemTray::SystemTray(Shelf* shelf)
+    : TrayBackgroundView(shelf), shelf_(shelf) {
   SetInkDropMode(InkDropMode::ON);
 
   // Since user avatar is on the right hand side of System tray of a
   // horizontal shelf and that is sufficient to indicate separation, no
   // separator is required.
   set_separator_visibility(false);
+
+  Shell::Get()->AddShellObserver(this);
+  if (Shell::Get()
+          ->maximize_mode_controller()
+          ->IsMaximizeModeWindowManagerEnabled()) {
+    in_maximize_mode_ = true;

[xiyuan, 2017/06/16 17:33:42]

nit: just do 

  in_maximize_mode_ = Shell::Get()
      ->maximize_mode_controller()
      ->IsMaximizeModeWindowManagerEnabled();

[minch1, 2017/06/16 22:11:51]

Done.

+  }
 }
 
 SystemTray::~SystemTray() {
@@ -214,6 +225,7 @@ SystemTray::~SystemTray() {
   system_bubble_.reset();
   for (const auto& item : items_)
     item->OnTrayViewDestroyed();
+  Shell::Get()->RemoveShellObserver(this);
 }
 
 void SystemTray::InitializeTrayItems(
@@ -589,6 +601,14 @@ void SystemTray::HideBubble(const TrayBubbleView* bubble_view) {
   HideBubbleWithView(bubble_view);
 }
 
+void SystemTray::OnMaximizeModeStarted() {
+  in_maximize_mode_ = true;
+}
+
+void SystemTray::OnMaximizeModeEnded() {
+  in_maximize_mode_ = false;
+}
+
 void SystemTray::CloseBubble(const ui::KeyEvent& key_event) {
   CloseSystemBubble();
 }
@@ -630,6 +650,10 @@ void SystemTray::ActivateBubble() {
   bubble_view->GetWidget()->Activate();
 }
 
+gfx::Rect SystemTray::GetWorkAreaBoundsInScreen() const {
+  return shelf_->GetUserWorkAreaBounds();
+}
+
 bool SystemTray::PerformAction(const ui::Event& event) {
   // If we're already showing a full system tray menu, either default or
   // detailed menu, hide it; otherwise, show it (and hide any popup that's
@@ -644,6 +668,109 @@ bool SystemTray::PerformAction(const ui::Event& event) {
   return true;
 }
 
+void SystemTray::OnGestureEvent(ui::GestureEvent* event) {
+  if (in_maximize_mode_ && shelf_->IsHorizontalAlignment() &&
+      ProcessGestureEvent(*event)) {
+    event->StopPropagation();
+  } else {
+    CustomButton::OnGestureEvent(event);
+  }
+}
+
+bool SystemTray::ProcessGestureEvent(const ui::GestureEvent& event) {
+  if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN)
+    return StartGestureDrag(event);
+
+  if (event.type() == ui::ET_GESTURE_SCROLL_UPDATE) {
+    UpdateGestureDrag(event);
+    return true;
+  }
+
+  if (event.type() == ui::ET_GESTURE_SCROLL_END ||
+      event.type() == ui::ET_SCROLL_FLING_START) {
+    CompleteGestureDrag(event);
+    return true;
+  }
+  return false;
+}
+
+bool SystemTray::StartGestureDrag(const ui::GestureEvent& gesture) {
+  if ((HasSystemBubble() && full_system_tray_menu_) ||
+      IsSwipingDownOnShelf(gesture)) {
+    return false;
+  }
+
+  gesture_drag_amount_ = 0.f;
+  ShowDefaultView(BUBBLE_CREATE_NEW);
+  system_tray_bubble_bounds_ =
+      system_bubble_->bubble_view()->GetWidget()->GetWindowBoundsInScreen();
+  UpdateBoundsOnGesture(gesture);
+  return true;
+}
+
+void SystemTray::UpdateGestureDrag(const ui::GestureEvent& gesture) {
+  UpdateBoundsOnGesture(gesture);
+  gesture_drag_amount_ += gesture.details().scroll_y();
+}
+
+void SystemTray::CompleteGestureDrag(const ui::GestureEvent& gesture) {
+  gfx::Rect target_bounds = system_tray_bubble_bounds_;
+  if (ShouldShowSystemBubbleForSwiping(gesture)) {
+    system_bubble_->bubble()->UpdateBounds(target_bounds, false);
+  } else {
+    target_bounds.set_y(shelf_->GetIdealBounds().y());
+    system_bubble_->bubble()->UpdateBounds(target_bounds, true);
+  }
+}
+
+bool SystemTray::IsSwipingDownOnShelf(const ui::GestureEvent& gesture) {
+  gfx::Point gesture_location = gesture.location();
+  View::ConvertPointToScreen(this, &gesture_location);
+
+  if (gesture_location.y() >= shelf_->GetIdealBounds().y() &&
+      gesture.details().scroll_y_hint() > 0) {
+    return true;
+  }
+  return false;
+}
+
+void SystemTray::UpdateBoundsOnGesture(const ui::GestureEvent& gesture) {
+  gfx::Point gesture_location = gesture.location();
+  View::ConvertPointToScreen(this, &gesture_location);
+
+  // System tray bubble should not be dragged higher than its original height.
+  if (gesture_location.y() < system_tray_bubble_bounds_.y())
+    gesture_location.set_y(system_tray_bubble_bounds_.y());
+
+  gfx::Rect bounds_on_gesture(
+      system_tray_bubble_bounds_.x(), gesture_location.y(),
+      system_tray_bubble_bounds_.width(), system_tray_bubble_bounds_.height());
+  system_bubble_->bubble_view()->GetWidget()->SetBounds(bounds_on_gesture);
+}
+
+bool SystemTray::ShouldShowSystemBubbleBasedOnPosition() {
+  if (gesture_drag_amount_ > 0)
+    return false;
+
+  int system_bubble_height = system_tray_bubble_bounds_.height();
+  float one_third = system_bubble_height / 3.0;
+
+  if (fabs(gesture_drag_amount_) < one_third)
+    return false;
+  return true;

[xiyuan, 2017/06/16 17:33:42]

nit: Line 758-760 can be this

  return fabs(gesture_drag_amount_) >= one_third;

[minch1, 2017/06/16 22:11:51]

Done.

+}
+
+bool SystemTray::ShouldShowSystemBubbleForSwiping(
+    const ui::GestureEvent& gesture) {
+  if (gesture.type() == ui::ET_GESTURE_SCROLL_END)
+    return ShouldShowSystemBubbleBasedOnPosition();
+
+  const float kSwipingVelocity = 100.0;

[xiyuan, 2017/06/16 17:33:42]

nit: 100.0 -> 100.0f since default is double, appending "f" to ensure correct
type for float.

[minch1, 2017/06/16 22:11:51]

Done.

+  if (fabs(gesture.details().velocity_y()) > kSwipingVelocity)
+    return gesture.details().velocity_y() < 0;
+  return ShouldShowSystemBubbleBasedOnPosition();
+}
+
 void SystemTray::CloseSystemBubbleAndDeactivateSystemTray() {
   activation_observer_.reset();
   key_event_watcher_.reset();