Touch gestures for System Tray/ IME/ Stylus/ Notifications

ash/system/tray/system_tray_unittest.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.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accessibility_delegate.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_bubble.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
+#include "ash/system/tray_drag_controller.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/test/test_system_tray_item.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/test/histogram_tester.h"
 #include "ui/base/ui_base_types.h"
@@ skipping 25 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate);
 };
 
 }  // namespace
 
 class SystemTrayTest : public AshTestBase {
  public:
   SystemTrayTest() {}
   ~SystemTrayTest() override {}
 
-  // Swiping on the system tray and ends with finger released.
+  // Swiping on the system tray and ends with finger released. Note, |start| is
+  // based on the system tray or system tray bubble's coordinate space.
   void SendGestureEvent(gfx::Point& start,
                         float delta,
                         bool is_fling,
-                        float velocity_y) {
-    SystemTray* system_tray = GetPrimarySystemTray();
+                        float velocity_y,
+                        float scroll_y_hint = -1.0f,
+                        bool drag_on_bubble = false) {
     base::TimeTicks timestamp = base::TimeTicks::Now();
-    SendScrollStartAndUpdate(start, delta, timestamp);
+    SendScrollStartAndUpdate(start, delta, timestamp, scroll_y_hint,
+                             drag_on_bubble);
 
     ui::GestureEventDetails details =
         is_fling
             ? ui::GestureEventDetails(ui::ET_SCROLL_FLING_START, 0, velocity_y)
             : ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_END);
     ui::GestureEvent event = ui::GestureEvent(start.x(), start.y() + delta,
                                               ui::EF_NONE, timestamp, details);
-    system_tray->OnGestureEvent(&event);
+    DispatchGestureEvent(event, drag_on_bubble);
   }
 
   // Swiping on the system tray without releasing the finger.
   void SendScrollStartAndUpdate(gfx::Point& start,
                                 float delta,
-                                base::TimeTicks& timestamp) {
-    SystemTray* system_tray = GetPrimarySystemTray();
-    ui::GestureEventDetails begin_details(ui::ET_GESTURE_SCROLL_BEGIN);
+                                base::TimeTicks& timestamp,
+                                float scroll_y_hint = -1.0f,
+                                bool drag_on_bubble = false) {
+    ui::GestureEventDetails begin_details(ui::ET_GESTURE_SCROLL_BEGIN, 0,
+                                          scroll_y_hint);
     ui::GestureEvent begin_event = ui::GestureEvent(
         start.x(), start.y(), ui::EF_NONE, timestamp, begin_details);
-    system_tray->OnGestureEvent(&begin_event);
+    DispatchGestureEvent(begin_event, drag_on_bubble);
 
     ui::GestureEventDetails update_details(ui::ET_GESTURE_SCROLL_UPDATE, 0,
                                            delta);
     timestamp += base::TimeDelta::FromMilliseconds(100);
     ui::GestureEvent update_event = ui::GestureEvent(
         start.x(), start.y() + delta, ui::EF_NONE, timestamp, update_details);
-    system_tray->OnGestureEvent(&update_event);
+    DispatchGestureEvent(update_event, drag_on_bubble);
+  }
+
+  // Dispatches |event| to target according to |drag_on_bubble|.
+  void DispatchGestureEvent(ui::GestureEvent event, bool drag_on_bubble) {

[tdanderson, 2017/07/17 22:44:36]

It looks like |event| is being passed by value from line 85. Is that
intentional?

[minch1, 2017/07/18 03:58:58]

Changed it to pointer.

+    SystemTray* system_tray = GetPrimarySystemTray();
+    views::View* target = drag_on_bubble
+                              ? system_tray->GetSystemBubble()->bubble_view()
+                              : static_cast<views::View*>(system_tray);

[tdanderson, 2017/07/17 22:44:36]

is this static_cast necessary?

[minch1, 2017/07/18 03:58:58]

I think so. Even though SystemTray and TrayBubbleView both are the subclass of
views::View. But they are not the superclass of each other. The expression can't
determine the type before assignment without static_cast here. There is an
"incompatible operand types" compiler error here without cast.

[tdanderson, 2017/07/18 16:38:05]

Acknowledged.

+    ui::Event::DispatcherApi(&event).set_target(target);
+    target->OnGestureEvent(&event);
   }
 
   // Open the default system tray bubble to get the height of the bubble and
   // then close it.
   float GetSystemBubbleHeight() {
     SystemTray* system_tray = GetPrimarySystemTray();
     system_tray->ShowDefaultView(BUBBLE_CREATE_NEW);
     gfx::Rect bounds = GetSystemBubbleBoundsInScreen();
     system_tray->CloseSystemBubble();
     return bounds.height();
   }
 
   gfx::Rect GetSystemBubbleBoundsInScreen() {
     return GetPrimarySystemTray()
         ->GetSystemBubble()
         ->bubble_view()
         ->GetWidget()
         ->GetWindowBoundsInScreen();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SystemTrayTest);
 };
 
 // Swiping on the overlap area of shelf and system tray bubble during the
 // animation should close the bubble.
 TEST_F(SystemTrayTest, SwipingOnShelfDuringAnimation) {

[tdanderson, 2017/07/17 22:44:36]

This CL lets any TrayBackgroundView with an associated bubble have the swipe
up/down behavior while in maximize mode. So ideally, all of the tests you've
added in SystemTrayTest for the swipe up/down behavior should probably be
testing this on TrayBackgroundView / TrayDragController directly rather than for
a specific surface. I suggest you add a TODO(minch) for this work, and that is
OK to handle as a follow-on.

[minch1, 2017/07/18 03:58:58]

Thanks. Added TODO for this.

   Shelf* shelf = GetPrimaryShelf();
   SystemTray* system_tray = GetPrimarySystemTray();
   gfx::Point start = system_tray->GetLocalBounds().CenterPoint();
-  shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->alignment());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
 
   gfx::Rect shelf_bounds_in_screen =
       shelf->shelf_widget()->GetWindowBoundsInScreen();
 
   system_tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   gfx::Rect original_bounds = GetSystemBubbleBoundsInScreen();
   system_tray->CloseSystemBubble();
 
@@ skipping 16 matching lines @@
 
   // Dragging the shelf during up animation should close the bubble.
   if (current_bounds.y() != original_bounds.y()) {
     generator.GestureScrollSequence(point_on_shelf_start, point_on_shelf_end,
                                     base::TimeDelta::FromMilliseconds(100), 5);
     EXPECT_FALSE(system_tray->HasSystemBubble());
   }
 
   // Fling down on the shelf with a velocity that exceeds |kFlingVelocity|.
   EXPECT_FALSE(system_tray->HasSystemBubble());
-  SendGestureEvent(start, delta, true, SystemTray::kFlingVelocity + 1);
+  SendGestureEvent(start, delta, true, TrayDragController::kFlingVelocity + 1);
   current_bounds = GetSystemBubbleBoundsInScreen();
   EXPECT_TRUE(system_tray->HasSystemBubble());
 
   // Dragging the shelf during down animation should close the bubble.
   if (current_bounds.y() != original_bounds.y()) {
     generator.GestureScrollSequence(point_on_shelf_start, point_on_shelf_end,
                                     base::TimeDelta::FromMilliseconds(100), 5);
     EXPECT_FALSE(system_tray->HasSystemBubble());
   }
 }
 
 // Swiping on the system tray ends with fling event.
 TEST_F(SystemTrayTest, FlingOnSystemTray) {
   Shelf* shelf = GetPrimaryShelf();
   SystemTray* system_tray = GetPrimarySystemTray();
-  gfx::Point start = system_tray->GetBoundsInScreen().CenterPoint();
-  shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
+  gfx::Point start = system_tray->GetLocalBounds().CenterPoint();
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->alignment());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
 
   // Fling up on the system tray should show the bubble if the |velocity_y| is
   // larger than |kFlingVelocity| and the dragging amount is larger than one
   // third of the height of the bubble.
   float delta = -GetSystemBubbleHeight();
-  SendGestureEvent(start, delta, true, -(SystemTray::kFlingVelocity + 1));
+  SendGestureEvent(start, delta, true,
+                   -(TrayDragController::kFlingVelocity + 1));
   EXPECT_TRUE(system_tray->HasSystemBubble());
   system_tray->CloseSystemBubble();
 
   // Fling up on the system tray should show the bubble if the |velocity_y| is
   // larger than |kFlingVelocity| even the dragging amount is less than one
   // third of the height of the bubble.
   delta /= 4;
-  SendGestureEvent(start, delta, true, -(SystemTray::kFlingVelocity + 1));
+  SendGestureEvent(start, delta, true,
+                   -(TrayDragController::kFlingVelocity + 1));
   EXPECT_TRUE(system_tray->HasSystemBubble());
   system_tray->CloseSystemBubble();
 
   // Fling up on the system tray should show the bubble if the |velocity_y| is
   // less than |kFlingVelocity| but the dragging amount if larger than one third
   // of the height of the bubble.
   delta = -GetSystemBubbleHeight();
-  SendGestureEvent(start, delta, true, -(SystemTray::kFlingVelocity - 1));
+  SendGestureEvent(start, delta, true,
+                   -(TrayDragController::kFlingVelocity - 1));
   EXPECT_TRUE(system_tray->HasSystemBubble());
   system_tray->CloseSystemBubble();
 
   // Fling up on the system tray should close the bubble if the |velocity_y|
   // is less than |kFlingVelocity| and the dragging amount is less than one
   // third of the height of the bubble.
   delta /= 4;
-  SendGestureEvent(start, delta, true, -(SystemTray::kFlingVelocity - 1));
+  SendGestureEvent(start, delta, true,
+                   -(TrayDragController::kFlingVelocity - 1));
   EXPECT_FALSE(system_tray->HasSystemBubble());
 
   // Fling down on the system tray should close the bubble if the |velocity_y|
   // is larger than kFLingVelocity.
-  SendGestureEvent(start, delta, true, SystemTray::kFlingVelocity + 1);
+  SendGestureEvent(start, delta, true, TrayDragController::kFlingVelocity + 1);
   EXPECT_FALSE(system_tray->HasSystemBubble());
 
   // Fling down on the system tray should close the bubble if the |velocity_y|
   // is larger than |kFlingVelocity| even the dragging amount is larger than one
   // third of the height of the bubble.
   delta = -GetSystemBubbleHeight();
-  SendGestureEvent(start, delta, true, SystemTray::kFlingVelocity + 1);
+  SendGestureEvent(start, delta, true, TrayDragController::kFlingVelocity + 1);
   EXPECT_FALSE(system_tray->HasSystemBubble());
 
   // Fling down on the system tray should open the bubble if the |velocity_y| is
   // less than |kFlingVelocity| but the dragging amount exceed one third of the
   // height of the bubble.
-  SendGestureEvent(start, delta, true, SystemTray::kFlingVelocity - 1);
+  SendGestureEvent(start, delta, true, TrayDragController::kFlingVelocity - 1);
   EXPECT_TRUE(system_tray->HasSystemBubble());
   system_tray->CloseSystemBubble();
 
   // Fling down on the system tray should close the bubble if the |velocity_y|
   // is less than |kFlingVelocity| and the dragging amount is less than one
   // third of the height of the bubble.
   delta /= 4;
-  SendGestureEvent(start, delta, true, SystemTray::kFlingVelocity - 1);
+  SendGestureEvent(start, delta, true, TrayDragController::kFlingVelocity - 1);
   EXPECT_FALSE(system_tray->HasSystemBubble());
 }
 
 // Touch outside the system tray bubble during swiping should close the bubble.
 TEST_F(SystemTrayTest, TapOutsideCloseBubble) {
   Shelf* shelf = GetPrimaryShelf();
   SystemTray* system_tray = GetPrimarySystemTray();
   gfx::Point start = system_tray->GetLocalBounds().CenterPoint();
-  shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->alignment());
 
   float delta = -GetSystemBubbleHeight();
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   base::TimeTicks timestamp = base::TimeTicks::Now();
   SendScrollStartAndUpdate(start, delta, timestamp);
   EXPECT_TRUE(system_tray->HasSystemBubble());
 
   ui::test::EventGenerator& generator = GetEventGenerator();
   gfx::Rect bounds = GetSystemBubbleBoundsInScreen();
   gfx::Point point_outside = gfx::Point(bounds.x() - 5, bounds.y() - 5);
   generator.GestureTapAt(point_outside);
   EXPECT_FALSE(system_tray->HasSystemBubble());
 }
 
 // Swiping on the system tray ends with scroll event.
 TEST_F(SystemTrayTest, SwipingOnSystemTray) {
   Shelf* shelf = GetPrimaryShelf();
   SystemTray* system_tray = GetPrimarySystemTray();
   gfx::Point start = system_tray->GetLocalBounds().CenterPoint();
-  shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->alignment());
 
   // Swiping up on the system tray has no effect if it is not in maximize mode.
   float delta = -GetSystemBubbleHeight();
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_FALSE(system_tray->HasSystemBubble());
   SendGestureEvent(start, delta, false, 0);
   EXPECT_FALSE(system_tray->HasSystemBubble());
 
   // Swiping up on the system tray should show the system tray bubble if it is
@@ skipping 23 matching lines @@
   shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
   SendGestureEvent(start, delta, false, 0);
   EXPECT_FALSE(system_tray->HasSystemBubble());
 
   // Swiping up on system tray should not show the system tray bubble if the
   // shelf is right alignment.
   shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
   SendGestureEvent(start, delta, false, 0);
   EXPECT_FALSE(system_tray->HasSystemBubble());
 
-  // Swiping down on the shelf should not show the system tray bubble.
+  // Beginning to scroll downward on the shelf should not show the system tray
+  // bubble, even if the drag then moves upwards.
   shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
-  delta = -delta;
-  SendGestureEvent(start, delta, false, 0);
+  SendGestureEvent(start, delta, false, 0, 1);
   EXPECT_FALSE(system_tray->HasSystemBubble());
 }
 
+// Swiping on opened system tray bubble.

[tdanderson, 2017/07/17 22:44:36]

Suggested: "Tests for swiping down on an open system tray bubble in order to
close it."

[minch1, 2017/07/18 03:58:58]

Done.

+TEST_F(SystemTrayTest, SwipingOnSystemTrayBubble) {
+  Shelf* shelf = GetPrimaryShelf();
+  SystemTray* system_tray = GetPrimarySystemTray();
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->alignment());
+
+  // Beginning to scroll downward and then swiping down more than one third of
+  // the bubble's height should close the bubble. This only takes effect in
+  // maximize mode.
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+      true);
+  system_tray->ShowDefaultView(BUBBLE_CREATE_NEW);
+  gfx::Rect bounds =
+      system_tray->GetSystemBubble()->bubble_view()->GetLocalBounds();
+  float delta = bounds.height() / 2;
+  gfx::Point start(bounds.x() + 5, bounds.y() + 5);
+  SendGestureEvent(start, delta, false, 0, 1, true);
+  EXPECT_FALSE(system_tray->HasSystemBubble());
+
+  // Beginning to scroll upward and then swiping down more than one third of the
+  // bubble's height should also close the bubble.
+  system_tray->ShowDefaultView(BUBBLE_CREATE_NEW);
+  SendGestureEvent(start, delta, false, 0, -1, true);
+  EXPECT_FALSE(system_tray->HasSystemBubble());
+
+  // Swiping on the bubble has no effect if it is not in maximize mode.
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+      false);
+  system_tray->ShowDefaultView(BUBBLE_CREATE_NEW);
+  SendGestureEvent(start, delta, false, 0, -1, true);
+  EXPECT_TRUE(system_tray->HasSystemBubble());
+}
+
 // Verifies only the visible default views are recorded in the
 // "Ash.SystemMenu.DefaultView.VisibleItems" histogram.
 TEST_F(SystemTrayTest, OnlyVisibleItemsRecorded) {
   SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   TestSystemTrayItem* test_item = new TestSystemTrayItem();
   tray->AddTrayItem(base::WrapUnique(test_item));
 
   base::HistogramTester histogram_tester;
@@ skipping 515 matching lines @@
 
   EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
 }
 
 TEST_F(SystemTrayTest, SeparatorThickness) {
   EXPECT_EQ(kSeparatorWidth, views::Separator::kThickness);
 }
 
 }  // namespace test
 }  // namespace ash