Move query commit logic.

Now that we have indication in the OnInteractionStarted event if we
are handling a voice interaction or not, we can move the commit
logic in the case of a non-voice interaction.

Doing so allows us to properly clear the stage whenever a new
interaction is started. This fixes a bug in which notifications
failed to clear the stage.

Bug: 111396118
Change-Id: I288ee685f9e8fa8c385c0dbb0896c03838c53a4e
Reviewed-on: https://chromium-review.googlesource.com/1144429Reviewed-by: Tao Wu <wutao@chromium.org>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: David Black <dmblack@google.com>
Cr-Commit-Position: refs/heads/master@{#576744}

ash/assistant/assistant_interaction_controller.cc

@@ -136,6 +136,9 @@ void AssistantInteractionController::OnInteractionStarted(
     assistant_interaction_model_.SetInputModality(InputModality::kVoice);
     assistant_interaction_model_.SetMicState(MicState::kOpen);
   } else {
+    // In the case of a non-voice interaction, we commit the pending query.
+    // This will trigger a clearing of the interaction which wipes the stage.
+    assistant_interaction_model_.CommitPendingQuery();
     assistant_interaction_model_.SetMicState(MicState::kClosed);
   }
 }
@@ -268,7 +271,6 @@ void AssistantInteractionController::StartTextInteraction(
 
   assistant_interaction_model_.SetPendingQuery(
       std::make_unique<AssistantTextQuery>(text));
-  assistant_interaction_model_.CommitPendingQuery();
 
   assistant_->SendTextQuery(text);
 }

ash/assistant/assistant_ui_controller.cc

@@ -112,9 +112,9 @@ void AssistantUiController::OnInteractionStateChanged(
     return;
 
   // If there is an active interaction, we need to show Assistant UI if it is
-  // not already showing. An interaction can only be started when the Assistant
-  // UI is hidden if the entry point is hotword.
-  ShowUi(AssistantSource::kHotword);
+  // not already showing. We don't have enough information here to know what
+  // the interaction source is, but at the moment we have no need to know.
+  ShowUi(AssistantSource::kUnspecified);
 }
 
 void AssistantUiController::OnMicStateChanged(MicState mic_state) {