Disable suggestion chips after submitting query

When an Assistant query has been submitted, you should not be able to
interact with the suggestion chips anymore.
Mouse clicks had always been disabled, but a bug still allowed the
user to submit queries using |TAB| and |ENTER|.

This CL also introduces some extra unittests that were missing.

Bug: b/151800188
Change-Id: Iaa132b836716c119656d39243895571af760f291
Tests: new ash_unittests with filter "AssistantPageViewTest.*"
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2129047Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Jeroen Dhollander <jeroendh@google.com>
Cr-Commit-Position: refs/heads/master@{#754993}

ash/app_list/views/assistant/assistant_dialog_plate.cc

@@ -245,6 +245,9 @@ void AssistantDialogPlate::OnInputModalityChanged(
 
 void AssistantDialogPlate::OnCommittedQueryChanged(
     const AssistantQuery& committed_query) {
+  // Whenever a query is submitted we return the focus to the dialog plate.
+  RequestFocus();
+
   DCHECK(query_history_iterator_);
   query_history_iterator_->ResetToLast();
 }

ash/app_list/views/assistant/assistant_page_view_unittest.cc

@@ -359,7 +359,7 @@ TEST_F(AssistantPageViewTest, FocusShouldRemainInAssistantViewWhenPressingTab) {
   int num_views = 0;
 
   do {
-    PressKeyAndWait(ui::KeyboardCode::VKEY_TAB);
+    PressKeyAndWait(ui::VKEY_TAB);
     focused_view = GetFocusedView();
     EXPECT_TRUE(page_view()->Contains(focused_view))
         << "Focus advanced to view '" << focused_view->GetClassName()
@@ -479,7 +479,7 @@ TEST_F(AssistantPageViewTest,
       CreateAndGetSuggestionChip("<suggestion chip query>");
 
   suggestion_chip->RequestFocus();
-  PressKeyAndWait(ui::KeyboardCode::VKEY_RETURN);
+  PressKeyAndWait(ui::VKEY_RETURN);
 
   EXPECT_INTERACTION_OF_TYPE(AssistantInteractionType::kText);
   EXPECT_EQ("<suggestion chip query>", current_interaction()->query);
@@ -492,7 +492,7 @@ TEST_F(AssistantPageViewTest,
       CreateAndGetSuggestionChip("<suggestion chip query>");
 
   suggestion_chip->RequestFocus();
-  PressKeyAndWait(ui::KeyboardCode::VKEY_SPACE);
+  PressKeyAndWait(ui::VKEY_SPACE);
 
   EXPECT_NO_INTERACTION();
 }
@@ -545,7 +545,7 @@ TEST_F(AssistantPageViewTest,
   auto suggestion_chips = GetSuggestionChips();
 
   suggestion_chips[0]->RequestFocus();
-  PressKeyAndWait(ui::KeyboardCode::VKEY_RETURN);
+  PressKeyAndWait(ui::VKEY_RETURN);
 
   for (auto* suggestion_chip : suggestion_chips) {
     EXPECT_FALSE(suggestion_chip->IsFocusable())
@@ -561,7 +561,7 @@ TEST_F(AssistantPageViewTest,
       CreateAndGetSuggestionChip("<suggestion chip query>");
 
   suggestion_chip->RequestFocus();
-  PressKeyAndWait(ui::KeyboardCode::VKEY_RETURN);
+  PressKeyAndWait(ui::VKEY_RETURN);
 
   EXPECT_HAS_FOCUS(input_text_field());
 }
@@ -574,7 +574,7 @@ TEST_F(AssistantPageViewTest,
   ClickOnAndWait(voice_input_toggle());
 
   suggestion_chip->RequestFocus();
-  PressKeyAndWait(ui::KeyboardCode::VKEY_RETURN);
+  PressKeyAndWait(ui::VKEY_RETURN);
 
   EXPECT_HAS_FOCUS(mic_view());
 }
@@ -588,6 +588,28 @@ TEST_F(AssistantPageViewTest,
   EXPECT_HAS_FOCUS(input_text_field());
 }
 
+TEST_F(AssistantPageViewTest,
+       ShouldNotScrollSuggestionChipsWhenSubmittingQuery) {
+  ShowAssistantUiInTextMode();
+  MockTextInteraction()
+      .WithSuggestionChip("there are                                        x")
+      .WithSuggestionChip("enough queries                                   x")
+      .WithSuggestionChip("to ensure                                        x")
+      .WithSuggestionChip("the                                              x")
+      .WithSuggestionChip("suggestion chips container                       x")
+      .WithSuggestionChip("can scroll.                                      x");
+
+  views::View* chip = GetSuggestionChips()[3];
+  chip->RequestFocus();
+  chip->ScrollViewToVisible();
+
+  gfx::Rect initial_bounds = chip->GetBoundsInScreen();
+  PressKeyAndWait(ui::VKEY_RETURN);
+  gfx::Rect final_bounds = chip->GetBoundsInScreen();
+
+  EXPECT_EQ(initial_bounds, final_bounds);
+}
+
 TEST_F(AssistantPageViewTest, RememberAndShowHistory) {
   ShowAssistantUiInTextMode();
   EXPECT_HAS_FOCUS(input_text_field());
@@ -599,19 +621,19 @@ TEST_F(AssistantPageViewTest, RememberAndShowHistory) {
 
   EXPECT_TRUE(input_text_field()->GetText().empty());
 
-  PressKey(ui::KeyboardCode::VKEY_UP);
+  PressKey(ui::VKEY_UP);
   EXPECT_EQ(input_text_field()->GetText(), base::UTF8ToUTF16("query 2"));
 
-  PressKey(ui::KeyboardCode::VKEY_UP);
+  PressKey(ui::VKEY_UP);
   EXPECT_EQ(input_text_field()->GetText(), base::UTF8ToUTF16("query 1"));
 
-  PressKey(ui::KeyboardCode::VKEY_UP);
+  PressKey(ui::VKEY_UP);
   EXPECT_EQ(input_text_field()->GetText(), base::UTF8ToUTF16("query 1"));
 
-  PressKey(ui::KeyboardCode::VKEY_DOWN);
+  PressKey(ui::VKEY_DOWN);
   EXPECT_EQ(input_text_field()->GetText(), base::UTF8ToUTF16("query 2"));
 
-  PressKey(ui::KeyboardCode::VKEY_DOWN);
+  PressKey(ui::VKEY_DOWN);
   EXPECT_TRUE(input_text_field()->GetText().empty());
 }
 

ash/assistant/ui/main_stage/animated_container_view.cc

@@ -277,6 +277,9 @@ void AnimatedContainerView::FadeOutViews() {
 }
 
 void AnimatedContainerView::SetInteractionsEnabled(bool enabled) {
+  set_can_process_events_within_subtree(enabled);
+  // We also need to enable/disable the individual views, to enable/disable
+  // processing of key events.
   for (const auto& animator : animators_)
     animator->view()->SetEnabled(enabled);
 }