Add Enable Assistant button to settings.

Muyuan Li · Commit Bot · commit 48a302ef16f5 · 2017-10-18T21:17:52.000Z
If ARC is not enabled or assistant value prop is not accepted, an "Enable" button will be shown and the runtime flow will be launched if user clicks it. BUG=b:65161403 TEST=manually test by: 1. Disabling play store 2. Clicking "Enable" button in assistant section. Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Change-Id: I7ffba0d8828a4b673504d77dd3512be28da241a5 Reviewed-on: https://chromium-review.googlesource.com/719599 Commit-Queue: Muyuan Li <muyuanli@chromium.org> Reviewed-by: Steven Bennetts <stevenjb@chromium.org> Reviewed-by: Yury Khmel <khmel@chromium.org> Cr-Commit-Position: refs/heads/master@{#509877}
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
@@ -2202,6 +2202,9 @@
   <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_DISABLED" desc="Sub label for the Google Assistant button when Assistant is disabled.">
     Disabled
   </message>
+  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_TURN_ON" desc="Label for the Google Assistant button when ARC is disabled or value prop is not accepted.">
+    Enable
+  </message>
 </if>
 
   <!-- Search Engines Page -->
diff --git a/chrome/browser/resources/settings/basic_page/basic_page.html b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -162,7 +162,16 @@
         <template is="dom-if" if="[[showPage_(pageVisibility.search)]]" restamp>
           <settings-section page-title="$i18n{searchPageTitle}"
               section="search">
+<if expr="chromeos">
+            <settings-search-page prefs="{{prefs}}"
+                 arc-enabled="[[prefs.arc.enabled.value]]"
+                 voice-interaction-value-prop-accepted="[[
+                     prefs.arc.voice_interaction_value_prop.accepted.value]]">
+            </settings-search-page>
+</if>
+<if expr="not chromeos">
             <settings-search-page prefs="{{prefs}}"></settings-search-page>
+</if>
           </settings-section>
         </template>
 <if expr="chromeos">
diff --git a/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.js b/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.js
@@ -85,6 +85,8 @@ cr.define('settings', function() {
 
     /** @param {boolean} enabled */
     setHotwordSearchEnabled(enabled) {}
+
+    turnOnGoogleAssistant() {}
   }
 
   /**
@@ -140,6 +142,11 @@ cr.define('settings', function() {
     setHotwordSearchEnabled(enabled) {
       chrome.send('setHotwordSearchEnabled', [enabled]);
     }
+
+    /** @override */
+    turnOnGoogleAssistant() {
+      chrome.send('turnOnGoogleAssistant');
+    }
   }
 
   // The singleton instance_ is replaced with a test version of this wrapper
diff --git a/chrome/browser/resources/settings/search_page/search_page.html b/chrome/browser/resources/settings/search_page/search_page.html
@@ -150,20 +150,29 @@
 
 <if expr="chromeos">
         <!-- Google Assistant -->
-        <template is="dom-if" if="[[showAssistantSection_(
-            voiceInteractionFeatureEnabled_, prefs.arc.enabled.value,
-            prefs.arc.voice_interaction_value_prop.accepted.value)]]">
+        <template is="dom-if" if="[[voiceInteractionFeatureEnabled_]]">
           <div id="assistant-subpage-trigger" class="settings-box two-line"
             on-tap="onGoogleAssistantTap_" actionable>
-          <div class="start">
-            $i18n{searchGoogleAssistant}
-            <div class="secondary">
-              [[getAssistantEnabledDisabledLabel_(
-                  prefs.settings.voice_interaction.enabled.value)]]
+            <div class="start">
+              $i18n{searchGoogleAssistant}
+              <div class="secondary">
+                [[getAssistantEnabledDisabledLabel_(
+                    prefs.settings.voice_interaction.enabled.value)]]
+              </div>
             </div>
-          </div>
-          <button class="subpage-arrow" is="paper-icon-button-light"
-              aria-label="$i18n{searchGoogleAssistant}"></button>
+            <template is="dom-if" if="[[assistantOn_]]">
+              <button class="subpage-arrow" is="paper-icon-button-light"
+                  aria-label="$i18n{searchGoogleAssistant}"></button>
+            </template>
+            <template is="dom-if" if="[[!assistantOn_]]">
+              <div class="separator"></div>
+              <paper-button id="enable" class="secondary-button"
+                  on-tap="onAssistantTurnOnTap_"
+                  aria-label="$i18n{searchPageTitle}"
+                  aria-describedby="secondaryText">
+                $i18n{assistantTurnOn}
+              </paper-button>
+            </template>
           </div>
         </template>
 </if>
diff --git a/chrome/browser/resources/settings/search_page/search_page.js b/chrome/browser/resources/settings/search_page/search_page.js
@@ -14,6 +14,12 @@ Polymer({
   properties: {
     prefs: Object,
 
+    // <if expr="chromeos">
+    arcEnabled: Boolean,
+
+    voiceInteractionValuePropAccepted: Boolean,
+    // </if>
+
     /**
      * List of default search engines available.
      * @private {!Array<!SearchEngine>}
@@ -50,6 +56,13 @@ Polymer({
       value: function() {
         return loadTimeData.getBoolean('enableVoiceInteraction');
       },
+    },
+
+    /** @private */
+    assistantOn_: {
+      type: Boolean,
+      computed:
+          'isAssistantTurnedOn_(arcEnabled, voiceInteractionValuePropAccepted)',
     }
     // </if>
   },
@@ -112,8 +125,18 @@ Polymer({
   /** @private */
   onGoogleAssistantTap_: function() {
     assert(this.voiceInteractionFeatureEnabled_);
+
+    if (!this.assistantOn_) {
+      return;
+    }
+
     settings.navigateTo(settings.routes.GOOGLE_ASSISTANT);
   },
+
+  /** @private */
+  onAssistantTurnOnTap_: function(event) {
+    this.browserProxy_.turnOnGoogleAssistant();
+  },
   // </if>
 
   /**
@@ -190,15 +213,13 @@ Polymer({
                       'searchGoogleAssistantDisabled');
   },
 
-  /**
-   * @param {boolean} featureAvailable
-   * @param {boolean} arcEnabled
-   * @return {boolean}
-   * @private
+  /** @private
+   *  @param {boolean} arcEnabled
+   *  @param {boolean} valuePropAccepted
+   *  @return {boolean}
    */
-  showAssistantSection_: function(
-      featureAvailable, arcEnabled, valuePropAccepted) {
-    return featureAvailable && arcEnabled && valuePropAccepted;
+  isAssistantTurnedOn_: function(arcEnabled, valuePropAccepted) {
+    return arcEnabled && valuePropAccepted;
   },
   // </if>
 
diff --git a/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.cc b/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/arc/arc_service_manager.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace chromeos {
 namespace settings {
@@ -37,6 +38,10 @@ void GoogleAssistantHandler::RegisterMessages() {
       "showGoogleAssistantSettings",
       base::Bind(&GoogleAssistantHandler::HandleShowGoogleAssistantSettings,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "turnOnGoogleAssistant",
+      base::Bind(&GoogleAssistantHandler::HandleTurnOnGoogleAssistant,
+                 base::Unretained(this)));
 }
 
 void GoogleAssistantHandler::HandleSetGoogleAssistantEnabled(
@@ -71,5 +76,13 @@ void GoogleAssistantHandler::HandleShowGoogleAssistantSettings(
     service->ShowVoiceInteractionSettings();
 }
 
+void GoogleAssistantHandler::HandleTurnOnGoogleAssistant(
+    const base::ListValue* args) {
+  auto* service =
+      arc::ArcVoiceInteractionFrameworkService::GetForBrowserContext(profile_);
+  if (service)
+    service->StartSessionFromUserInteraction(gfx::Rect());
+}
+
 }  // namespace settings
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.h b/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.h
@@ -29,6 +29,8 @@ class GoogleAssistantHandler : public ::settings::SettingsPageUIHandler {
   void HandleSetGoogleAssistantContextEnabled(const base::ListValue* args);
   // WebUI call to launch into the Google Assistant app settings.
   void HandleShowGoogleAssistantSettings(const base::ListValue* args);
+  // WebUI call to launch assistant runtime flow.
+  void HandleTurnOnGoogleAssistant(const base::ListValue* args);
 
   Profile* const profile_;
 
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -1612,6 +1612,7 @@ void AddSearchStrings(content::WebUIDataSource* html_source, Profile* profile) {
      IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_ENABLED},
     {"searchGoogleAssistantDisabled",
      IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_DISABLED},
+    {"assistantTurnOn", IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_TURN_ON},
 #endif
     {"searchOkGoogleSubtextAlwaysOn",
      IDS_SETTINGS_SEARCH_OK_GOOGLE_SUBTEXT_ALWAYS_ON},
