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"
@@ skipping 48 matching lines @@
 }  // namespace
 
 class SystemTrayTest : public AshTestBase {
  public:
   SystemTrayTest() {}
   ~SystemTrayTest() override {}
 
   // Swiping on the system tray and ends with finger released.
   void SendGestureEvent(gfx::Point& start,
                         float delta,
+                        float begin_scroll_y_hint,
                         bool is_fling,
-                        float velocity_y) {
+                        float velocity_y,
+                        bool is_on_bubble) {

[sammiequon, 2017/06/29 21:28:19]

what happens when |is_on_bubble| is true but |start| is not actually on the
bubble? Would it make more sense to compute |is_on_bubble| locally? 
i.e.

const bool is_on_bubble = system_tray->GetBoundsInScreen().Contains(start);

[minch1, 2017/06/30 17:02:30]

Since |start| can be point on the system tray, elsewhere except system tray
during dragging(i.e, desktop) and on the system tray bubble. And it is a point
in the view's own coordinate. I think it is not convenience here to convert it
to the screen's coordinate and compare with the bounds of the system tray(we
need to know the specific view that start is on).

[sammiequon, 2017/06/30 17:46:02]

Acknowledged.

     SystemTray* system_tray = GetPrimarySystemTray();
     base::TimeTicks timestamp = base::TimeTicks::Now();
-    SendScrollStartAndUpdate(start, delta, timestamp);
+    SendScrollStartAndUpdate(start, delta, begin_scroll_y_hint, timestamp,

[sammiequon, 2017/06/29 21:28:19]

AFAICT, |velocity_y| tells the direction as well? Can we instead
SendScrollStartAndUpdate(start, delta, velocity_y > 0.f, ...) ? ignore if this
is not |velocity_y| is for.

[minch1, 2017/06/30 17:02:30]

I think the |velocity_y| is only for fling event? And, here GestureEventDetails
for SCROLL_START has no velocity_y too.

[sammiequon, 2017/06/30 17:46:02]

Acknowledged.

+                             is_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);
+    if (is_on_bubble) {
+      system_tray->ProcessGestureEventOnBubbleView(
+          &event, system_tray->GetSystemBubble()->bubble_view());
+    } else {
+      system_tray->OnGestureEvent(&event);
+    }
   }
 
   // Swiping on the system tray without releasing the finger.
   void SendScrollStartAndUpdate(gfx::Point& start,
                                 float delta,
-                                base::TimeTicks& timestamp) {
+                                float begin_scroll_y_hint,
+                                base::TimeTicks& timestamp,
+                                bool is_on_bubble) {
     SystemTray* system_tray = GetPrimarySystemTray();
-    ui::GestureEventDetails begin_details(ui::ET_GESTURE_SCROLL_BEGIN);
+    ui::GestureEventDetails begin_details(ui::ET_GESTURE_SCROLL_BEGIN, 0,
+                                          begin_scroll_y_hint);
     ui::GestureEvent begin_event = ui::GestureEvent(
         start.x(), start.y(), ui::EF_NONE, timestamp, begin_details);
-    system_tray->OnGestureEvent(&begin_event);
+
+    if (is_on_bubble) {
+      system_tray->ProcessGestureEventOnBubbleView(
+          &begin_event, system_tray->GetSystemBubble()->bubble_view());
+    } else {
+      system_tray->OnGestureEvent(&begin_event);
+    }
 
     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);
+
+    if (is_on_bubble) {
+      system_tray->ProcessGestureEventOnBubbleView(
+          &update_event, system_tray->GetSystemBubble()->bubble_view());
+    } else {
+      system_tray->OnGestureEvent(&update_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();
@@ skipping 34 matching lines @@
 
   ui::test::EventGenerator& generator = GetEventGenerator();
   gfx::Point point_on_shelf_start =
       gfx::Point(original_bounds.x() + 5, shelf_bounds_in_screen.y() + 5);
   gfx::Point point_on_shelf_end(point_on_shelf_start.x(),
                                 shelf_bounds_in_screen.bottom());
 
   // Swiping up exceed one third of the height of the bubble should show the
   // bubble.
   float delta = -original_bounds.height() / 2;
-  SendGestureEvent(start, delta, false, 0);
+  SendGestureEvent(start, delta, -1, false, 0, false);
   EXPECT_TRUE(system_tray->HasSystemBubble());
   gfx::Rect current_bounds = GetSystemBubbleBoundsInScreen();
 
   // 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, -1, true, SystemTray::kFlingVelocity + 1,
+                   false);
   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);
   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, -1, true, -(SystemTray::kFlingVelocity + 1),
+                   false);
   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, -1, true, -(SystemTray::kFlingVelocity + 1),
+                   false);
   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, -1, true, -(SystemTray::kFlingVelocity - 1),
+                   false);
   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, -1, true, -(SystemTray::kFlingVelocity - 1),
+                   false);
   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, -1, true, SystemTray::kFlingVelocity + 1,
+                   false);
   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, -1, true, SystemTray::kFlingVelocity + 1,
+                   false);
   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, -1, true, SystemTray::kFlingVelocity - 1,
+                   false);
   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, -1, true, SystemTray::kFlingVelocity - 1,
+                   false);
   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);
 
   float delta = -GetSystemBubbleHeight();
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   base::TimeTicks timestamp = base::TimeTicks::Now();
-  SendScrollStartAndUpdate(start, delta, timestamp);
+  SendScrollStartAndUpdate(start, delta, -1, timestamp, false);
   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);
 
   // 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);
+  SendGestureEvent(start, delta, -1, false, 0, false);
   EXPECT_FALSE(system_tray->HasSystemBubble());
 
   // Swiping up on the system tray should show the system tray bubble if it is
   // in maximize mode.
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
-  SendGestureEvent(start, delta, false, 0);
+  SendGestureEvent(start, delta, -1, false, 0, false);
   EXPECT_TRUE(system_tray->HasSystemBubble());
   system_tray->CloseSystemBubble();
 
   // Swiping up less than one third of the bubble's height should not show the
   // bubble.
   delta /= 4;
-  SendGestureEvent(start, delta, false, 0);
+  SendGestureEvent(start, delta, -1, false, 0, false);
   EXPECT_FALSE(system_tray->HasSystemBubble());
 
   // Swiping up more than one third of the bubble's height should show the
   // bubble.
   delta = -GetSystemBubbleHeight() / 2;
-  SendGestureEvent(start, delta, false, 0);
+  SendGestureEvent(start, delta, -1, false, 0, false);
   EXPECT_TRUE(system_tray->HasSystemBubble());
   system_tray->CloseSystemBubble();
 
   // Swiping up on system tray should not show the system tray bubble if the
   // shelf is left alignment.
   delta = -GetSystemBubbleHeight();
   shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
-  SendGestureEvent(start, delta, false, 0);
+  SendGestureEvent(start, delta, -1, false, 0, false);
   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);
+  SendGestureEvent(start, delta, -1, false, 0, false);
   EXPECT_FALSE(system_tray->HasSystemBubble());
 
-  // Swiping down on the shelf should not show the system tray bubble.
+  // Begins to scroll downward on the shelf should not show the system tray
+  // bubble.
   shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
-  delta = -delta;
-  SendGestureEvent(start, delta, false, 0);
+  SendGestureEvent(start, delta, 1, false, 0, false);
   EXPECT_FALSE(system_tray->HasSystemBubble());
 }
 
+// Swiping on opened system tray bubble.
+TEST_F(SystemTrayTest, SwipingOnSystemTrayBubble) {
+  Shelf* shelf = GetPrimaryShelf();
+  SystemTray* system_tray = GetPrimarySystemTray();
+  shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+      true);
+
+  // Begins to scroll downward and swiping down more than one third of the
+  // bubble's height should close the bubble.
+  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, 1, false, 0, true);
+  EXPECT_FALSE(system_tray->HasSystemBubble());
+
+  // Begins to scroll upward and 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, -1, false, 0, true);
+  EXPECT_FALSE(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