gd: In fullscreen, a touch event hides the game dashboard button.

In fullscreen, when a user touches the screen outside of the game
dashboard button's bounds, automatically hide the button.

Bug: b/349428551
Test: Added and ran ASH unit tests
Change-Id: I6519acfb0d33b4c403ff7443b28ce88195a6c028
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5659427
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Commit-Queue: Prameet Shah <phshah@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1320461}

ash/game_dashboard/game_dashboard_button_reveal_controller.cc

@@ -131,6 +131,26 @@ void GameDashboardButtonRevealController::OnGestureEvent(
   }
 }
 
+void GameDashboardButtonRevealController::OnTouchEvent(ui::TouchEvent* event) {
+  // If the main menu is open, or the Game Dashboard button is not visible, do
+  // nothing.
+  if (event->type() != ui::ET_TOUCH_PRESSED || context_->IsMainMenuOpen() ||
+      !context_->game_dashboard_button_widget()->IsVisible()) {
+    return;
+  }
+  // If the touch event is within the Game Dashboard button, do nothing.
+  const gfx::Point touch_event_location =
+      event->target()->GetScreenLocation(*event);
+  if (context_->game_dashboard_button_widget()
+          ->GetWindowBoundsInScreen()
+          .Contains(touch_event_location)) {
+    return;
+  }
+
+  // Hide the button. The touch event is outside the Game Dashboard button.
+  UpdateVisibility(/*target_visibility=*/false, /*animate=*/true);
+}
+
 bool GameDashboardButtonRevealController::CanShowGameDashboardButton(
     const gfx::Point& mouse_screen_location) {
   return !context_->game_dashboard_button_widget()->IsVisible() &&

ash/game_dashboard/game_dashboard_button_reveal_controller.h

@@ -37,6 +37,7 @@ class GameDashboardButtonRevealController : public ui::EventHandler {
   // ui::EventHandler:
   void OnMouseEvent(ui::MouseEvent* event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
+  void OnTouchEvent(ui::TouchEvent* event) override;
 
  private:
   friend class GameDashboardContextTestApi;

ash/game_dashboard/game_dashboard_context_unittest.cc

@@ -738,6 +738,26 @@ class GameDashboardContextTest : public GameDashboardTestBase {
     EXPECT_EQ(test_api_->GetToolbarSnapLocation(), desired_location);
   }
 
+  void CreateAnArcAppInFullscreen() {
+    // Create an ARC game window.
+    SetAppBounds(gfx::Rect(50, 50, 800, 700));
+    CreateGameWindow(/*is_arc_window=*/true,
+                     /*set_arc_game_controls_flags_prop=*/true);
+
+    auto* window_state = WindowState::Get(game_window_.get());
+    ASSERT_TRUE(window_state->IsNormalStateType());
+    views::Widget* button_widget = test_api_->GetGameDashboardButtonWidget();
+    CHECK(button_widget);
+
+    // Set initial state to fullscreen and verify Game Dashboard button widget
+    // is not visible.
+    ASSERT_FALSE(test_api_->GetGameDashboardButtonRevealController());
+    ToggleFullScreen(window_state, /*delegate=*/nullptr);
+    ASSERT_TRUE(window_state->IsFullscreen());
+    ASSERT_FALSE(button_widget->IsVisible());
+    ASSERT_TRUE(test_api_->GetGameDashboardButtonRevealController());
+  }
+
  protected:
   void DragToolbarToPoint(Movement move_type,
                           const gfx::Point& new_location,
@@ -1490,7 +1510,8 @@ TEST_F(GameDashboardContextTest, GameDashboardButtonFullscreen) {
   ASSERT_FALSE(window_state->IsFullscreen());
   ASSERT_TRUE(button_widget->IsVisible());
 
-  // Switch to fullscreen and verify Game Dashboard button widget is visible.
+  // Switch to fullscreen and verify Game Dashboard button widget is not
+  // visible.
   ToggleFullScreen(window_state, /*delegate=*/nullptr);
   ASSERT_TRUE(window_state->IsFullscreen());
   ASSERT_FALSE(button_widget->IsVisible());
@@ -1557,41 +1578,23 @@ TEST_F(GameDashboardContextTest, GameDashboardButtonFullscreenWithMainMenu) {
 
 TEST_F(GameDashboardContextTest,
        GameDashboardButtonFullscreen_MouseOverAndTouchGesture) {
-  // Create an ARC game window.
-  SetAppBounds(gfx::Rect(50, 50, 800, 700));
-  CreateGameWindow(/*is_arc_window=*/true,
-                   /*set_arc_game_controls_flags_prop=*/true);
-
-  auto* event_generator = GetEventGenerator();
-  auto app_bounds = game_window_->GetBoundsInScreen();
-  auto* window_state = WindowState::Get(game_window_.get());
-  ASSERT_TRUE(window_state->IsNormalStateType());
+  CreateAnArcAppInFullscreen();
   views::Widget* button_widget = test_api_->GetGameDashboardButtonWidget();
   CHECK(button_widget);
 
-  // Set initial state to fullscreen and verify Game Dashboard button widget is
-  // not visible.
-  ASSERT_FALSE(test_api_->GetGameDashboardButtonRevealController());
-  ToggleFullScreen(window_state, /*delegate=*/nullptr);
-  ASSERT_TRUE(window_state->IsFullscreen());
-  ASSERT_FALSE(button_widget->IsVisible());
-  ASSERT_TRUE(test_api_->GetGameDashboardButtonRevealController());
-  ASSERT_FALSE(test_api_->GetGameDashboardButtonWidget()->IsVisible());
-
   // Move mouse to top edge of window.
-  app_bounds = game_window_->GetBoundsInScreen();
+  const auto app_bounds = game_window_->GetBoundsInScreen();
+  auto* event_generator = GetEventGenerator();
   event_generator->MoveMouseTo(app_bounds.top_center());
   base::OneShotTimer& top_edge_hover_timer =
       test_api_->GetRevealControllerTopEdgeHoverTimer();
   ASSERT_TRUE(top_edge_hover_timer.IsRunning());
   top_edge_hover_timer.FireNow();
   ASSERT_TRUE(button_widget->IsVisible());
-  ASSERT_TRUE(test_api_->GetGameDashboardButtonWidget()->IsVisible());
 
   // Move mouse to the center of the app, and verify Game Dashboard button
   // widget is not visible.
   event_generator->MoveMouseTo(app_bounds.CenterPoint());
-  ASSERT_FALSE(test_api_->GetGameDashboardButtonWidget()->IsVisible());
   ASSERT_FALSE(button_widget->IsVisible());
 
   // Touch drag from top edge of window.
@@ -1599,13 +1602,11 @@ TEST_F(GameDashboardContextTest,
                                          app_bounds.CenterPoint(),
                                          kTouchDragDuration, kTouchDragSteps);
   ASSERT_TRUE(button_widget->IsVisible());
-  ASSERT_TRUE(test_api_->GetGameDashboardButtonWidget()->IsVisible());
 
   // Touch drag to top edge of window.
   event_generator->GestureScrollSequence(app_bounds.CenterPoint(),
                                          app_bounds.top_center(),
                                          kTouchDragDuration, kTouchDragSteps);
-  ASSERT_FALSE(test_api_->GetGameDashboardButtonWidget()->IsVisible());
   ASSERT_FALSE(button_widget->IsVisible());
 
   // Re-open the game dashboard button and touch drag to bottom edge of window.
@@ -1613,12 +1614,10 @@ TEST_F(GameDashboardContextTest,
                                          app_bounds.CenterPoint(),
                                          kTouchDragDuration, kTouchDragSteps);
   ASSERT_TRUE(button_widget->IsVisible());
-  ASSERT_TRUE(test_api_->GetGameDashboardButtonWidget()->IsVisible());
 
   event_generator->GestureScrollSequence(app_bounds.CenterPoint(),
                                          app_bounds.bottom_center(),
                                          kTouchDragDuration, kTouchDragSteps);
-  ASSERT_FALSE(test_api_->GetGameDashboardButtonWidget()->IsVisible());
   ASSERT_FALSE(button_widget->IsVisible());
 
   // Touch drag to bottom edge of window while the game dashboard button is
@@ -1626,7 +1625,29 @@ TEST_F(GameDashboardContextTest,
   event_generator->GestureScrollSequence(app_bounds.CenterPoint(),
                                          app_bounds.bottom_center(),
                                          kTouchDragDuration, kTouchDragSteps);
-  ASSERT_FALSE(test_api_->GetGameDashboardButtonWidget()->IsVisible());
+  ASSERT_FALSE(button_widget->IsVisible());
+}
+
+TEST_F(GameDashboardContextTest, GameDashboardButtonFullscreen_TouchEvent) {
+  CreateAnArcAppInFullscreen();
+  views::Widget* button_widget = test_api_->GetGameDashboardButtonWidget();
+  CHECK(button_widget);
+
+  // Move mouse to top edge of window, and verify Game Dashboard button
+  // widget is visible.
+  const auto app_bounds = game_window_->GetBoundsInScreen();
+  auto* event_generator = GetEventGenerator();
+  event_generator->MoveMouseTo(app_bounds.top_center());
+  base::OneShotTimer& top_edge_hover_timer =
+      test_api_->GetRevealControllerTopEdgeHoverTimer();
+  ASSERT_TRUE(top_edge_hover_timer.IsRunning());
+  top_edge_hover_timer.FireNow();
+  ASSERT_TRUE(button_widget->IsVisible());
+
+  // Touch outside the Game Dashboard button widget's bounds and verify the
+  // widget is hidden.
+  event_generator->PressTouch(app_bounds.right_center());
+  event_generator->ReleaseTouch();
   ASSERT_FALSE(button_widget->IsVisible());
 }