overview gesture: Avoid accidental window snap in splitscreen.

Modified based on the new spec:
A window has to be dragged toward the direction of the edge of the
screen for a minimum of 96dp to a point within 48dp of the edge of
the screen, or dragged inside 8dp from edge to be snapped.

Bug: 1021294
Change-Id: I2d79854b37bfdf36bcd5319a856b874233159982
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2037825Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Xiaoqian Dai <xdai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738444}

ash/home_screen/drag_window_from_shelf_controller.cc

@@ -473,7 +473,8 @@ DragWindowFromShelfController::GetSnapPosition(
 
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   SplitViewController::SnapPosition snap_position = ::ash::GetSnapPosition(
-      root_window, window_, gfx::ToRoundedPoint(location_in_screen));
+      root_window, window_, gfx::ToRoundedPoint(location_in_screen),
+      kScreenEdgeInsetForSnap, kScreenEdgeInsetForSnap);
 
   // For portrait mode, since the drag starts from the bottom of the screen,
   // we should only allow the window to snap to the top of the screen.
@@ -485,40 +486,37 @@ DragWindowFromShelfController::GetSnapPosition(
     snap_position = SplitViewController::NONE;
   }
 
-  // If the drag does not start in the screen edge, the window has to be dragged
-  // toward the snap position by |min_drag_distance| to allow to be snapped.
+  // A window has to be dragged toward the direction of the edge of the screen
+  // for a minimum of |kMinDragDistance| to a point within
+  // |kScreenEdgeInsetForSnap| of the edge of the screen, or dragged inside
+  // |kDistanceFromEdge| from edge.
   if (snap_position != SplitViewController::NONE) {
-    // Check if the drag starts within 16dp from screen edge. Only need to
-    // consider about landscape case as in portrait mode, the drag always starts
-    // from bottom and we don't allow to snap in bottom.
-    bool started_in_screen_edge = false;
-    const int initial_x = initial_location_in_screen_.x();
-    const int initial_y = initial_location_in_screen_.y();
-    if (is_landscape) {
-      const gfx::Rect work_area =
+    const gfx::Rect area =
         screen_util::GetDisplayWorkAreaBoundsInScreenForActiveDeskContainer(
             root_window);
-      started_in_screen_edge =
-          initial_x <= work_area.x() + kDistanceFromEdge ||
-          initial_x > work_area.right() - kDistanceFromEdge;
+
+    // Check if the drag ends inside |kDistanceFromEdge| from edge. If so, the
+    // window should be get snapped no matter how far it's been dragged.
+    bool drag_end_near_edge = false;
+    if ((is_landscape &&
+         (location_in_screen.x() < kDistanceFromEdge ||
+          location_in_screen.x() > area.right() - kDistanceFromEdge)) ||
+        (!is_landscape &&
+         (location_in_screen.y() < kDistanceFromEdge ||
+          location_in_screen.y() > area.bottom() - kDistanceFromEdge))) {
+      drag_end_near_edge = true;
     }
 
-    if (!started_in_screen_edge) {
-      // Check if the drag starts in the snap region.
-      const bool started_in_snap_region =
-          ::ash::GetSnapPosition(
-              root_window, window_,
-              gfx::ToRoundedPoint(initial_location_in_screen_)) !=
-          SplitViewController::NONE;
+    if (!drag_end_near_edge) {
+      // Check how far the window has been dragged.
+      const int initial_x = initial_location_in_screen_.x();
+      const int initial_y = initial_location_in_screen_.y();
       const int distance = is_landscape ? location_in_screen.x() - initial_x
                                         : location_in_screen.y() - initial_y;
-      const int min_drag_distance = started_in_snap_region
-                                        ? kMinDragDistanceInSnapRegion
-                                        : kMinDragDistanceOutsideSnapRegion;
       if ((SplitViewController::IsPhysicalLeftOrTop(snap_position) &&
-           distance > -min_drag_distance) ||
+           distance > -kMinDragDistance) ||
           (!SplitViewController::IsPhysicalLeftOrTop(snap_position) &&
-           distance < min_drag_distance)) {
+           distance < kMinDragDistance)) {
         snap_position = SplitViewController::NONE;
       }
     }

ash/home_screen/drag_window_from_shelf_controller.h

@@ -52,15 +52,14 @@ class ASH_EXPORT DragWindowFromShelfController : public aura::WindowObserver {
   // If the window drag starts within |kDistanceFromEdge| from screen edge, it
   // will get snapped if the drag ends in the snap region, no matter how far
   // the window has been dragged.
-  static constexpr int kDistanceFromEdge = 16;
-  // If the window drag starts in a snap region, it needs to be dragged
-  // |kMinDragDistanceInSnapRegion| toward the snap direction for the window to
-  // be snapped.
-  static constexpr int kMinDragDistanceInSnapRegion = 48;
-  // If the window drag starts outside a snap region, it needs to be dragged
-  // |kMinDragDistanceOutsideSnapRegion| toward the snap direction for the
-  // window to be snapped.
-  static constexpr int kMinDragDistanceOutsideSnapRegion = 96;
+  static constexpr int kDistanceFromEdge = 8;
+
+  // A window has to be dragged toward the direction of the edge of the screen
+  // for a minimum of |kMinDragDistance| to a point within
+  // |kScreenEdgeInsetForSnap| of the edge of the screen, or dragged inside
+  // |kDistanceFromEdge| from edge to be snapped.
+  static constexpr int kScreenEdgeInsetForSnap = 48;
+  static constexpr int kMinDragDistance = 96;
 
   // The distance for the dragged window to pass over the bottom of the display
   // so that it can be dragged into home launcher or overview. If not pass this

ash/home_screen/drag_window_from_shelf_controller_unittest.cc

@@ -677,9 +677,8 @@ TEST_F(DragWindowFromShelfControllerTest, DragToSnapMinDistance) {
   const gfx::Rect display_bounds = display::Screen::GetScreen()
                                        ->GetDisplayNearestWindow(window1.get())
                                        .bounds();
-  int snap_edge_inset =
-      display_bounds.width() * kHighlightScreenPrimaryAxisRatio +
-      kHighlightScreenEdgePaddingDp;
+  const int snap_edge_inset =
+      DragWindowFromShelfController::kScreenEdgeInsetForSnap;
 
   base::HistogramTester histogram_tester;
   histogram_tester.ExpectBucketCount(kHandleDragWindowFromShelfHistogramName,
@@ -699,9 +698,7 @@ TEST_F(DragWindowFromShelfControllerTest, DragToSnapMinDistance) {
       window_drag_controller());
   // Drag into the snap region and release.
   gfx::Point end = gfx::Point(
-      start.x() -
-          DragWindowFromShelfController::kMinDragDistanceOutsideSnapRegion + 10,
-      200);
+      start.x() - DragWindowFromShelfController::kMinDragDistance + 10, 200);
   EndDrag(end, base::nullopt);
   OverviewController* overview_controller = Shell::Get()->overview_controller();
   EXPECT_TRUE(overview_controller->InOverviewSession());
@@ -718,8 +715,8 @@ TEST_F(DragWindowFromShelfControllerTest, DragToSnapMinDistance) {
   EXPECT_FALSE(overview_controller->InOverviewSession());
   EXPECT_FALSE(split_view_controller()->InSplitViewMode());
 
-  // If the drag starts outside of the snap region and then into snap region,
-  // and the drag distance is long enough.
+  // If the drag starts outside of the snap region and then into snap region
+  // (kScreenEdgeInsetForSnap), and the drag distance is long enough.
   StartDrag(window1.get(), start, HotseatState::kExtended);
 
   Drag(start + gfx::Vector2d(0, 100), 0.f, 1.f);
@@ -727,8 +724,7 @@ TEST_F(DragWindowFromShelfControllerTest, DragToSnapMinDistance) {
       window_drag_controller());
 
   // Drag into the snap region and release.
-  end.set_x(start.x() - 10 -
-            DragWindowFromShelfController::kMinDragDistanceOutsideSnapRegion);
+  end.set_x(start.x() - 10 - DragWindowFromShelfController::kMinDragDistance);
   EndDrag(end, base::nullopt);
 
   EXPECT_TRUE(overview_controller->InOverviewSession());
@@ -746,8 +742,8 @@ TEST_F(DragWindowFromShelfControllerTest, DragToSnapMinDistance) {
   EXPECT_FALSE(overview_controller->InOverviewSession());
   EXPECT_FALSE(split_view_controller()->InSplitViewMode());
 
-  // If the drag starts inside of the snap region, but the drag distance is not
-  // long enough.
+  // If the drag starts inside of the snap region (kScreenEdgeInsetForSnap), but
+  // the drag distance is not long enough.
   start = gfx::Point(display_bounds.x() + snap_edge_inset - 5,
                      shelf_bounds.CenterPoint().y());
   StartDrag(window1.get(), start, HotseatState::kExtended);
@@ -755,8 +751,7 @@ TEST_F(DragWindowFromShelfControllerTest, DragToSnapMinDistance) {
   DragWindowFromShelfControllerTestApi().WaitUntilOverviewIsShown(
       window_drag_controller());
   // Drag for a small distance and release.
-  end.set_x(start.x() -
-            DragWindowFromShelfController::kMinDragDistanceInSnapRegion + 10);
+  end.set_x(start.x() - 10);
   EndDrag(end, base::nullopt);
   EXPECT_TRUE(overview_controller->InOverviewSession());
   EXPECT_FALSE(split_view_controller()->InSplitViewMode());
@@ -772,7 +767,8 @@ TEST_F(DragWindowFromShelfControllerTest, DragToSnapMinDistance) {
   EXPECT_FALSE(overview_controller->InOverviewSession());
   EXPECT_FALSE(split_view_controller()->InSplitViewMode());
 
-  // If the drag starts near the screen edge, the window should snap directly.
+  // If the drag starts near the screen edge (kDistanceFromEdge), the window
+  // should snap directly.
   start = gfx::Point(
       display_bounds.x() + DragWindowFromShelfController::kDistanceFromEdge - 5,
       shelf_bounds.CenterPoint().y());
@@ -849,9 +845,7 @@ TEST_F(DragWindowFromShelfControllerTest,
   // to the home screen.
   gfx::Point end =
       start -
-      gfx::Vector2d(
-          10 + DragWindowFromShelfController::kMinDragDistanceOutsideSnapRegion,
-          200);
+      gfx::Vector2d(10 + DragWindowFromShelfController::kMinDragDistance, 200);
   EndDrag(end, base::nullopt);
 
   EXPECT_FALSE(Shell::Get()->overview_controller()->InOverviewSession());

ash/wm/overview/overview_window_drag_controller.cc

@@ -733,7 +733,11 @@ SplitViewController::SnapPosition OverviewWindowDragController::GetSnapPosition(
 
   return ::ash::GetSnapPosition(
       GetRootWindowBeingDraggedIn(), item_->GetWindow(),
-      gfx::Point(location_in_screen.x(), location_in_screen.y()));
+      gfx::Point(location_in_screen.x(), location_in_screen.y()),
+      area.width() * kHighlightScreenPrimaryAxisRatio +
+          kHighlightScreenEdgePaddingDp,
+      area.height() * kHighlightScreenPrimaryAxisRatio +
+          kHighlightScreenEdgePaddingDp);
 }
 
 void OverviewWindowDragController::SnapWindow(

ash/wm/splitview/split_view_utils.cc

@@ -415,7 +415,9 @@ void ShowAppCannotSnapToast() {
 SplitViewController::SnapPosition GetSnapPosition(
     aura::Window* root_window,
     aura::Window* window,
-    const gfx::Point& location_in_screen) {
+    const gfx::Point& location_in_screen,
+    int horizontal_edge_inset,
+    int vertical_edge_inset) {
   if (!ShouldAllowSplitView() ||
       !SplitViewController::Get(root_window)->CanSnapWindow(window)) {
     return SplitViewController::NONE;
@@ -430,10 +432,7 @@ SplitViewController::SnapPosition GetSnapPosition(
       screen_util::GetDisplayWorkAreaBoundsInScreenForActiveDeskContainer(
           root_window));
   if (horizontal) {
-    const int screen_edge_inset_for_drag =
-        area.width() * kHighlightScreenPrimaryAxisRatio +
-        kHighlightScreenEdgePaddingDp;
-    area.Inset(screen_edge_inset_for_drag, 0);
+    area.Inset(horizontal_edge_inset, 0);
     if (location_in_screen.x() <= area.x()) {
       return right_side_up ? SplitViewController::LEFT
                            : SplitViewController::RIGHT;
@@ -445,10 +444,7 @@ SplitViewController::SnapPosition GetSnapPosition(
     return SplitViewController::NONE;
   }
 
-  const int screen_edge_inset_for_drag =
-      area.height() * kHighlightScreenPrimaryAxisRatio +
-      kHighlightScreenEdgePaddingDp;
-  area.Inset(0, screen_edge_inset_for_drag);
+  area.Inset(0, vertical_edge_inset);
   if (location_in_screen.y() <= area.y())
     return right_side_up ? SplitViewController::LEFT
                          : SplitViewController::RIGHT;

ash/wm/splitview/split_view_utils.h

@@ -142,11 +142,14 @@ ASH_EXPORT void ShowAppCannotSnapToast();
 // return value is not |SplitViewController::NONE|), |window| must first of all
 // satisfy |SplitViewController::CanSnapWindow| on the split view controller for
 // |root_window|, and secondly be dragged near a suitable edge of the work area
-// of |root_window|.
+// of |root_window| (|horizontal_edge_inset| if dragged horizontally to snap, or
+// |vertical_edge_inset| if dragged vertically to snap).
 ASH_EXPORT SplitViewController::SnapPosition GetSnapPosition(
     aura::Window* root_window,
     aura::Window* window,
-    const gfx::Point& location_in_screen);
+    const gfx::Point& location_in_screen,
+    int horizontal_edge_inset,
+    int vertical_edge_inset);
 
 }  // namespace ash
 

ash/wm/tablet_mode/tablet_mode_window_drag_delegate.cc

@@ -7,6 +7,7 @@
 #include "ash/display/screen_orientation_controller.h"
 #include "ash/public/cpp/window_backdrop.h"
 #include "ash/root_window_controller.h"
+#include "ash/screen_util.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/system/overview/overview_button_tray.h"
@@ -355,9 +356,16 @@ SplitViewController::SnapPosition TabletModeWindowDragDelegate::GetSnapPosition(
     return SplitViewController::NONE;
   }
 
+  const gfx::Rect area =
+      screen_util::GetDisplayWorkAreaBoundsInScreenForActiveDeskContainer(
+          dragged_window_);
   SplitViewController::SnapPosition snap_position =
       ::ash::GetSnapPosition(Shell::GetPrimaryRootWindow(), dragged_window_,
-                             gfx::ToRoundedPoint(location_in_screen));
+                             gfx::ToRoundedPoint(location_in_screen),
+                             area.width() * kHighlightScreenPrimaryAxisRatio +
+                                 kHighlightScreenEdgePaddingDp,
+                             area.height() * kHighlightScreenPrimaryAxisRatio +
+                                 kHighlightScreenEdgePaddingDp);
 
   // For portrait mode, since the drag always starts from the top of the
   // screen, we only allow the window to be dragged to snap to the bottom of