snap-groups: Add observers fo FasterSplitScreenSetup

Fixed: b/307838944
Change-Id: Ie3c042d50d17a6e589bedf9f71d269d1b10c4c59
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4986375
Commit-Queue: Sophie Wen <sophiewen@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1216543}

ash/wm/overview/overview_grid.cc

@@ -2309,10 +2309,9 @@ void OverviewGrid::OnSplitViewStateChanged(
   }
 
   if (window_util::IsFasterSplitScreenOrSnapGroupArm1Enabled()) {
-    // When an activated is auto snapped, it will send a state change and try to
-    // end overview here. Ignore split view state when `kFasterSplitScreenSetup`
-    // or `kSnapGroup` arm1 is enabled.
-    RefreshGridBounds(/*animate=*/false);
+    // When an activated window is auto snapped, it will send a state change and
+    // try to end overview here. Ignore split view state when
+    // `kFasterSplitScreenSetup` or `kSnapGroup` arm1 is enabled.
     return;
   }
 
@@ -2346,6 +2345,13 @@ void OverviewGrid::OnSplitViewStateChanged(
 }
 
 void OverviewGrid::OnSplitViewDividerPositionChanged() {
+  if (window_util::IsFasterSplitScreenOrSnapGroupArm1Enabled()) {
+    // If `IsFasterSplitScreenOrSnapGroupArm1Enabled` is true,
+    // `SplitViewOverviewSession` will manually update the bounds so we don't
+    // need to update here.
+    return;
+  }
+
   SetBoundsAndUpdatePositions(
       GetGridBoundsInScreen(root_window_,
                             /*window_dragging_state=*/absl::nullopt,

ash/wm/snap_group/snap_group_unittest.cc

@@ -229,8 +229,11 @@ SplitViewOverviewSession* VerifySplitViewOverviewSession(aura::Window* window) {
   EXPECT_TRUE(expected_grid_bounds.Contains(GetOverviewGridBounds()));
   // Hotseat may be on the bottom of the work area.
   EXPECT_TRUE(work_area_bounds().Contains(expected_grid_bounds));
-  EXPECT_TRUE(
-      GetOverviewGridForRoot(window->GetRootWindow())->no_windows_widget());
+
+  if (!Shell::Get()->IsInTabletMode()) {
+    EXPECT_TRUE(
+        GetOverviewGridForRoot(window->GetRootWindow())->no_windows_widget());
+  }
 
   return split_view_overview_session;
 }
@@ -635,8 +638,10 @@ TEST_F(FasterSplitScreenTest,
 
 // Tests the histograms for the split view overview session exit points are
 // recorded correctly in tablet mode.
+// SplitViewOverviewSession should not support tablet mode.
+// TODO(sophiewen): Re-enable or delete this.
 TEST_F(FasterSplitScreenTest,
-       SplitViewOverviewSessionExitPointTabletHistograms) {
+       DISABLED_SplitViewOverviewSessionExitPointTabletHistograms) {
   UpdateDisplay("800x600");
   SwitchToTabletMode();
   EXPECT_TRUE(Shell::Get()->IsInTabletMode());

ash/wm/splitview/split_view_controller.cc

@@ -1357,9 +1357,6 @@ bool SplitViewController::BoundsChangeIsFromVKAndAllowed(
 }
 
 void SplitViewController::AddObserver(SplitViewObserver* observer) {
-  if (window_util::IsFasterSplitScreenOrSnapGroupArm1Enabled()) {
-    return;
-  }
   observers_.AddObserver(observer);
 }
 

ash/wm/window_state.cc

@@ -555,7 +555,11 @@ void WindowState::OnWMEvent(const WMEvent* event) {
   if (snap_event && IsSnapped()) {
     const WindowSnapActionSource snap_action_source =
         snap_event->snap_action_source();
-    if (features::IsFasterSplitScreenSetupEnabled()) {
+    if (features::IsFasterSplitScreenSetupEnabled() &&
+        !Shell::Get()->IsInTabletMode()) {
+      // SplitViewController will start the partial overview session, no need
+      // for SplitViewOverviewSession.
+      // TODO(sophiewen): See if checking tablet mode is necessary.
       window_util::MaybeStartSplitViewOverview(window_, snap_action_source);
       return;
     }

ash/wm/window_util.cc

@@ -654,6 +654,10 @@ bool ShouldRoundThumbnailWindow(views::View* backdrop_view,
 }
 
 bool IsFasterSplitScreenOrSnapGroupArm1Enabled() {
+  if (Shell::Get()->IsInTabletMode()) {
+    // FasterSplitScreen is not supported in tablet mode.
+    return false;
+  }
   if (features::IsFasterSplitScreenSetupEnabled()) {
     return true;
   }