Add observer methods for Assistant launch with mic open setting

Bug: b/115843337
Test: Update test case in unit_tests
Change-Id: I29bb87c4a138e4a14f99f4a28b1be54afeb1dedb
Reviewed-on: https://chromium-review.googlesource.com/1244441
Commit-Queue: Yue Li <updowndota@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595539}

ash/public/interfaces/voice_interaction_controller.mojom

@@ -106,6 +106,9 @@ interface VoiceInteractionController {
   // Called when the locale is changed.
   NotifyLocaleChanged(string locale);
 
+  // Called when the launch with mic open state is changed.
+  NotifyLaunchWithMicOpen(bool launch_with_mic_open);
+
   // Return if the voice interaction setting is enabled/disabled.
   IsSettingEnabled() => (bool enabled);
 

ash/voice_interaction/voice_interaction_controller.cc

@@ -77,6 +77,11 @@ void VoiceInteractionController::NotifyLocaleChanged(
       [locale](auto* observer) { observer->OnLocaleChanged(locale); });
 }
 
+void VoiceInteractionController::NotifyLaunchWithMicOpen(
+    bool launch_with_mic_open) {
+  launch_with_mic_open_ = launch_with_mic_open;
+}
+
 void VoiceInteractionController::IsSettingEnabled(
     IsSettingEnabledCallback callback) {
   std::move(callback).Run(settings_enabled_);

ash/voice_interaction/voice_interaction_controller.h

@@ -31,6 +31,7 @@ class ASH_EXPORT VoiceInteractionController
   void NotifyFeatureAllowed(mojom::AssistantAllowedState state) override;
   void NotifyNotificationEnabled(bool enabled) override;
   void NotifyLocaleChanged(const std::string& locale) override;
+  void NotifyLaunchWithMicOpen(bool launch_with_mic_open) override;
   void IsSettingEnabled(IsSettingEnabledCallback callback) override;
   void IsSetupCompleted(IsSetupCompletedCallback callback) override;
   void IsContextEnabled(IsContextEnabledCallback callback) override;
@@ -51,6 +52,8 @@ class ASH_EXPORT VoiceInteractionController
 
   bool notification_enabled() const { return notification_enabled_; }
 
+  bool launch_with_mic_open() const { return launch_with_mic_open_; }
+
   void FlushForTesting();
 
  private:
@@ -80,6 +83,9 @@ class ASH_EXPORT VoiceInteractionController
 
   std::string locale_;
 
+  // Whether the Assistant should launch with mic open;
+  bool launch_with_mic_open_ = false;
+
   mojo::BindingSet<mojom::VoiceInteractionController> bindings_;
 
   mojo::InterfacePtrSet<mojom::VoiceInteractionObserver> observers_;

chrome/browser/chromeos/arc/voice_interaction/fake_voice_interaction_controller.cc

@@ -53,6 +53,11 @@ void FakeVoiceInteractionController::NotifyLocaleChanged(
   locale_ = locale;
 }
 
+void FakeVoiceInteractionController::NotifyLaunchWithMicOpen(
+    bool launch_with_mic_open) {
+  launch_with_mic_open_ = launch_with_mic_open;
+}
+
 void FakeVoiceInteractionController::IsSettingEnabled(
     IsSettingEnabledCallback callback) {
   std::move(callback).Run(voice_interaction_settings_enabled_);

chrome/browser/chromeos/arc/voice_interaction/fake_voice_interaction_controller.h

@@ -27,6 +27,7 @@ class FakeVoiceInteractionController
   void NotifyFeatureAllowed(ash::mojom::AssistantAllowedState state) override;
   void NotifyNotificationEnabled(bool enabled) override;
   void NotifyLocaleChanged(const std::string& locale) override;
+  void NotifyLaunchWithMicOpen(bool launch_with_mic_open) override;
   void IsSettingEnabled(IsSettingEnabledCallback callback) override;
   void IsSetupCompleted(IsSetupCompletedCallback callback) override;
   void IsContextEnabled(IsContextEnabledCallback callback) override;
@@ -54,8 +55,8 @@ class FakeVoiceInteractionController
   bool voice_interaction_notification_enabled() const {
     return voice_interaction_notification_enabled_;
   }
-
   const std::string& locale() const { return locale_; }
+  bool launch_with_mic_open() const { return launch_with_mic_open_; }
 
  private:
   ash::mojom::VoiceInteractionState voice_interaction_state_ =
@@ -68,6 +69,7 @@ class FakeVoiceInteractionController
   std::string locale_;
   ash::mojom::AssistantAllowedState assistant_allowed_state_ =
       ash::mojom::AssistantAllowedState::DISALLOWED_BY_INCOGNITO;
+  bool launch_with_mic_open_ = false;
 
   mojo::Binding<ash::mojom::VoiceInteractionController> binding_;
 

chrome/browser/chromeos/arc/voice_interaction/voice_interaction_controller_client.cc

@@ -145,6 +145,14 @@ void VoiceInteractionControllerClient::NotifyLocaleChanged() {
   voice_interaction_controller_->NotifyLocaleChanged(out_locale);
 }
 
+void VoiceInteractionControllerClient::NotifyLaunchWithMicOpen() {
+  DCHECK(profile_);
+  PrefService* prefs = profile_->GetPrefs();
+  bool voice_preferred =
+      prefs->GetBoolean(prefs::kVoiceInteractionLaunchWithMicOpen);
+  voice_interaction_controller_->NotifyLaunchWithMicOpen(voice_preferred);
+}
+
 void VoiceInteractionControllerClient::ActiveUserChanged(
     const user_manager::User* active_user) {
   if (active_user && active_user->is_profile_created())
@@ -212,12 +220,18 @@ void VoiceInteractionControllerClient::SetProfile(Profile* profile) {
       base::BindRepeating(
           &VoiceInteractionControllerClient::NotifyNotificationEnabled,
           base::Unretained(this)));
+  pref_change_registrar_->Add(
+      prefs::kVoiceInteractionLaunchWithMicOpen,
+      base::BindRepeating(
+          &VoiceInteractionControllerClient::NotifyLaunchWithMicOpen,
+          base::Unretained(this)));
 
   NotifySetupCompleted();
   NotifySettingsEnabled();
   NotifyContextEnabled();
   NotifyLocaleChanged();
   NotifyNotificationEnabled();
+  NotifyLaunchWithMicOpen();
   if (prefs->GetBoolean(prefs::kVoiceInteractionEnabled))
     NotifyHotwordEnabled();
 }

chrome/browser/chromeos/arc/voice_interaction/voice_interaction_controller_client.h

@@ -60,6 +60,7 @@ class VoiceInteractionControllerClient
   void NotifyFeatureAllowed();
   void NotifyNotificationEnabled();
   void NotifyLocaleChanged();
+  void NotifyLaunchWithMicOpen();
 
   // user_manager::UserManager::UserSessionStateObserver overrides:
   void ActiveUserChanged(const user_manager::User* active_user) override;

chrome/browser/chromeos/arc/voice_interaction/voice_interaction_controller_client_unittest.cc

@@ -153,6 +153,13 @@ TEST_F(VoiceInteractionControllerClientTest, PrefChangeSendsNotification) {
   ASSERT_EQ("en-CA", prefs->GetString(language::prefs::kApplicationLocale));
   voice_interaction_controller_client()->FlushMojoForTesting();
   EXPECT_EQ("en-CA", voice_interaction_controller()->locale());
+
+  ASSERT_EQ(false,
+            prefs->GetBoolean(prefs::kVoiceInteractionLaunchWithMicOpen));
+  prefs->SetBoolean(prefs::kVoiceInteractionLaunchWithMicOpen, true);
+  ASSERT_EQ(true, prefs->GetBoolean(prefs::kVoiceInteractionLaunchWithMicOpen));
+  voice_interaction_controller_client()->FlushMojoForTesting();
+  EXPECT_EQ(true, voice_interaction_controller()->launch_with_mic_open());
 }
 
 }  // namespace arc