Treat regular and always-on hotwording settings as mutually exclusive.

Only one should be set, so update functions to reflect this. In the rare
case both are set, always-on takes precedence.

BUG=397019

Review URL: https://codereview.chromium.org/685053002

Cr-Commit-Position: refs/heads/master@{#302382}

chrome/browser/resources/hotword/launcher_manager.js

@@ -23,8 +23,7 @@ cr.define('hotword', function() {
 
     /** @override */
     enabled: function() {
-      return this.stateManager.isEnabled() &&
-          !this.stateManager.isAlwaysOnEnabled();
+      return this.stateManager.isSometimesOnEnabled();
     },
 
     /** @override */

chrome/browser/resources/hotword/page_audio_manager.js

@@ -431,9 +431,7 @@ cr.define('hotword', function() {
      * @private
      */
     updateListeners_: function() {
-      var enabled = this.stateManager_.isEnabled() &&
-          !this.stateManager_.isAlwaysOnEnabled();
-      if (enabled) {
+      if (this.stateManager_.isSometimesOnEnabled()) {
         this.setupListeners_();
       } else {
         this.removeListeners_();

chrome/browser/resources/hotword/state_manager.js

@@ -140,11 +140,15 @@ cr.define('hotword', function() {
     },
 
     /**
-     * @return {boolean} True if hotwording is enabled.
+     * @return {boolean} True if google.com/NTP/launcher hotwording is enabled.
      */
-    isEnabled: function() {
-      assert(this.hotwordStatus_, 'No hotwording status (isEnabled)');
-      return this.hotwordStatus_.enabled;
+    isSometimesOnEnabled: function() {
+      assert(this.hotwordStatus_,
+             'No hotwording status (isSometimesOnEnabled)');
+      // Although the two settings are supposed to be mutually exclusive, it's
+      // possible for both to be set. In that case, always-on takes precedence.
+      return this.hotwordStatus_.enabled &&
+          !this.hotwordStatus_.alwaysOnEnabled;
     },
 
     /**
@@ -152,8 +156,7 @@ cr.define('hotword', function() {
      */
     isAlwaysOnEnabled: function() {
       assert(this.hotwordStatus_, 'No hotword status (isAlwaysOnEnabled)');
-      return this.hotwordStatus_.enabled &&
-          this.hotwordStatus_.alwaysOnEnabled;
+      return this.hotwordStatus_.alwaysOnEnabled;
     },
 
     /**
@@ -178,7 +181,7 @@ cr.define('hotword', function() {
       if (!this.hotwordStatus_)
         return;
 
-      if (this.hotwordStatus_.enabled) {
+      if (this.hotwordStatus_.enabled || this.hotwordStatus_.alwaysOnEnabled) {
         // Start the detector if there's a session, and shut it down if there
         // isn't.
         // NOTE(amistry): With always-on, we want a different behaviour with

chrome/browser/ui/app_list/start_page_service.cc

@@ -174,8 +174,10 @@ void StartPageService::ToggleSpeechRecognition() {
 
 bool StartPageService::HotwordEnabled() {
   if (HotwordService::IsExperimentalHotwordingEnabled()) {
+    auto prefs = profile_->GetPrefs();
     return HotwordServiceFactory::IsServiceAvailable(profile_) &&
-        profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled);
+        (prefs->GetBoolean(prefs::kHotwordSearchEnabled) ||
+         prefs->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled));
   }
 #if defined(OS_CHROMEOS)
   return HotwordServiceFactory::IsServiceAvailable(profile_) &&