assistant: Do not focus mic button by default

To reduce the ChromeVox interaction in Assistant listening mode,
This patch:
1. Does not focus on the Mic button when showing the voice input UI.
2. Fixes a bug that shows keyboard input UI first and then switch to
   voice input UI.

Bug: b/167501035
Test: Updated tests
Change-Id: I6bdc83a114f4a8a6ebeb691ec0d784ec5696cf44
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2532929
Commit-Queue: Tao Wu <wutao@chromium.org>
Reviewed-by: David Tseng <dtseng@chromium.org>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828389}

ash/app_list/views/assistant/assistant_dialog_plate.cc

@@ -296,7 +296,7 @@ views::View* AssistantDialogPlate::FindFirstFocusableView() {
     case InputModality::kKeyboard:
       return textfield_;
     case InputModality::kVoice:
-      return animated_voice_input_toggle_;
+      return voice_layout_container_;
   }
 }
 

ash/app_list/views/assistant/assistant_page_view_unittest.cc

@@ -430,10 +430,10 @@ TEST_F(AssistantPageViewTest,
   }
 }
 
-TEST_F(AssistantPageViewTest, ShouldFocusMicWhenOpeningWithHotword) {
+TEST_F(AssistantPageViewTest, ShouldNotFocusMicWhenOpeningWithHotword) {
   ShowAssistantUi(AssistantEntryPoint::kHotword);
 
-  EXPECT_HAS_FOCUS(mic_view());
+  EXPECT_NOT_HAS_FOCUS(mic_view());
 }
 
 TEST_F(AssistantPageViewTest, ShouldShowGreetingLabelWhenOpening) {
@@ -628,12 +628,13 @@ TEST_F(AssistantPageViewTest,
   EXPECT_FALSE(onboarding_view()->IsDrawn());
 }
 
-TEST_F(AssistantPageViewTest, ShouldFocusMicViewWhenPressingVoiceInputToggle) {
+TEST_F(AssistantPageViewTest,
+       ShouldNotFocusMicViewWhenPressingVoiceInputToggle) {
   ShowAssistantUiInTextMode();
 
   ClickOnAndWait(voice_input_toggle());
 
-  EXPECT_HAS_FOCUS(mic_view());
+  EXPECT_NOT_HAS_FOCUS(mic_view());
 }
 
 TEST_F(AssistantPageViewTest,
@@ -934,16 +935,17 @@ class AssistantPageViewTabletModeTest : public AssistantPageViewTest {
 };
 
 TEST_F(AssistantPageViewTabletModeTest,
-       ShouldFocusMicWhenOpeningWithLongPressLauncher) {
+       ShouldNotFocusMicWhenOpeningWithLongPressLauncher) {
   ShowAssistantUi(AssistantEntryPoint::kLongPressLauncher);
 
-  EXPECT_HAS_FOCUS(mic_view());
+  EXPECT_NOT_HAS_FOCUS(mic_view());
 }
 
-TEST_F(AssistantPageViewTabletModeTest, ShouldFocusMicWhenOpeningWithHotword) {
+TEST_F(AssistantPageViewTabletModeTest,
+       ShouldNotFocusMicWhenOpeningWithHotword) {
   ShowAssistantUi(AssistantEntryPoint::kHotword);
 
-  EXPECT_HAS_FOCUS(mic_view());
+  EXPECT_NOT_HAS_FOCUS(mic_view());
 }
 
 TEST_F(AssistantPageViewTabletModeTest, ShouldFocusTextFieldAfterSendingQuery) {

ash/assistant/assistant_interaction_controller_impl.cc

@@ -282,7 +282,6 @@ void AssistantInteractionControllerImpl::OnUiVisibilityChanged(
       // reset the interaction state and restore the default input modality.
       StopActiveInteraction(true);
       model_.ClearInteraction();
-      model_.SetInputModality(GetDefaultInputModality());
       break;
     case AssistantVisibility::kVisible:
       OnUiVisible(entry_point.value());
@@ -902,12 +901,15 @@ void AssistantInteractionControllerImpl::OnPendingResponseProcessed(
 void AssistantInteractionControllerImpl::OnUiVisible(
     AssistantEntryPoint entry_point) {
   DCHECK(IsVisible());
+  const bool is_voice_entry =
+      assistant::util::IsVoiceEntryPoint(entry_point, IsPreferVoice());
+  model_.SetInputModality(is_voice_entry ? InputModality::kVoice
+                                         : InputModality::kKeyboard);
 
   // We don't explicitly start a new voice interaction if the entry point
   // is hotword since in such cases a voice interaction will already be in
   // progress.
-  if (assistant::util::IsVoiceEntryPoint(entry_point, IsPreferVoice()) &&
-      entry_point != AssistantEntryPoint::kHotword) {
+  if (is_voice_entry && entry_point != AssistantEntryPoint::kHotword) {
     StartVoiceInteraction();
     return;
   }