UX updates to OS settings search/assistant section

Latest revision to PRD specifies:
* Rename section to "Assistant"
* Remove the search engine link to browser settings
* Hide the whole section when assistant isn't available

See bug for screenshots.

This CL plumbs "showAssistant" from settings UI to main to page
similarly to how showApps is handled.

TODO: Once we're sure there won't be other search settings here,
rename the files/section to "os_assistant_page".

Bug: 960937
Test: manual on device (with assistant) and on linux-chromeos (without)
Change-Id: I97e4409f6751123bad2ce364230adb17e7d7e9ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1650525Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#667371}

chrome/app/os_settings_strings.grdp

@@ -20,9 +20,9 @@
     Open the wallpaper app
   </message>
 
-  <!-- Search and Assistant section. -->
-  <message name="IDS_OS_SETTINGS_SEARCH_ENGINE_LABEL" desc="Label in OS settings describing search engine behavior.">
-    Searches from the app launcher use your browser <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>search engine setting<ph name="END_LINK">&lt;/a&gt;</ph>.
+  <!-- Assistant section. -->
+  <message name="IDS_OS_SETTINGS_ASSISTANT" desc="Name of the settings section for the Google Assistant.">
+    Assistant
   </message>
 </if>
 </grit-part>

chrome/browser/resources/settings/chromeos/os_search_page/os_search_page.html

@@ -6,7 +6,6 @@
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="../../google_assistant_page/google_assistant_page.html">
 <link rel="import" href="../../google_assistant_page/google_assistant_browser_proxy.html">
-<link rel="import" href="../../icons.html">
 <link rel="import" href="../../i18n_setup.html">
 <link rel="import" href="../../route.html">
 <link rel="import" href="../../settings_page/settings_animated_pages.html">
@@ -14,52 +13,37 @@
 <link rel="import" href="../../settings_shared_css.html">
 <link rel="import" href="../../settings_vars_css.html">
 
+<!-- TODO(jamescook): Rename to "os-assistant-page". -->
 <dom-module id="os-settings-search-page">
   <template>
-    <style include="settings-shared md-select">
-      iron-icon {
-        padding-inline-end: 16px;
-      }
+    <style include="settings-shared">
     </style>
+    <!-- TODO(jamescook): Rename section to "assistant". -->
     <settings-animated-pages id="pages" section="search"
         focus-config="[[focusConfig_]]">
       <div route-path="default">
-
         <!-- Google Assistant -->
-        <template is="dom-if" if="[[isAssistantAllowed_]]">
-          <div id="assistantSubpageTrigger" class="settings-box first two-line"
-              on-click="onGoogleAssistantTap_" actionable>
-            <div class="start">
-              $i18n{searchGoogleAssistant}
-              <div class="secondary">
-                [[getAssistantEnabledDisabledLabel_(
-                    prefs.settings.voice_interaction.enabled.value)]]
-              </div>
-            </div>
-            <cr-icon-button class="subpage-arrow"
-                aria-label="$i18n{searchGoogleAssistant}"></cr-icon-button>
-          </div>
-        </template>
-
-        <!-- Label explaining that the app launcher search box uses the
-              browser's search engine. -->
-        <div class="settings-box">
+        <div id="assistantSubpageTrigger" class="settings-box first two-line"
+            on-click="onGoogleAssistantTap_" actionable>
           <div class="start">
-            <iron-icon icon="cr:info-outline"></iron-icon>
-            $i18nRaw{osSearchEngineLabel}
+            $i18n{searchGoogleAssistant}
+            <div class="secondary">
+              [[getAssistantEnabledDisabledLabel_(
+                  prefs.settings.voice_interaction.enabled.value)]]
+            </div>
           </div>
+          <cr-icon-button class="subpage-arrow"
+              aria-label="$i18n{searchGoogleAssistant}"></cr-icon-button>
         </div>
       </div>
 
-      <template is="dom-if" if="[[isAssistantAllowed_]]">
-        <template is="dom-if" route-path="/googleAssistant">
-          <settings-subpage
-              associated-control="[[$$('#assistantSubpageTrigger')]]"
-              page-title="$i18n{googleAssistantPageTitle}">
-            <settings-google-assistant-page prefs="{{prefs}}">
-            </settings-google-assistant-page>
-          </settings-subpage>
-        </template>
+      <template is="dom-if" route-path="/googleAssistant">
+        <settings-subpage
+            associated-control="[[$$('#assistantSubpageTrigger')]]"
+            page-title="$i18n{googleAssistantPageTitle}">
+          <settings-google-assistant-page prefs="{{prefs}}">
+          </settings-google-assistant-page>
+        </settings-subpage>
       </template>
     </settings-animated-pages>
   </template>

chrome/browser/resources/settings/chromeos/os_search_page/os_search_page.js

@@ -4,7 +4,7 @@
 
 /**
  * @fileoverview
- * 'os-settings-search-page' contains search and assistant settings.
+ * 'os-settings-search-page' contains assistant settings.
  */
 Polymer({
   is: 'os-settings-search-page',
@@ -16,18 +16,11 @@ Polymer({
 
     /** @type {?Map<string, string>} */
     focusConfig_: Object,
-
-    /** @private Can be disallowed due to flag, policy, locale, etc. */
-    isAssistantAllowed_: {
-      type: Boolean,
-      value: function() {
-        return loadTimeData.getBoolean('isAssistantAllowed');
-      },
-    },
   },
 
   /** @override */
   ready: function() {
+    assert(loadTimeData.getBoolean('isAssistantAllowed'));
     this.focusConfig_ = new Map();
     if (settings.routes.GOOGLE_ASSISTANT) {
       this.focusConfig_.set(
@@ -38,7 +31,6 @@ Polymer({
 
   /** @private */
   onGoogleAssistantTap_: function() {
-    assert(this.isAssistantAllowed_);
     settings.navigateTo(settings.routes.GOOGLE_ASSISTANT);
   },
 

chrome/browser/resources/settings/chromeos/os_settings_main/os_settings_main.html

@@ -64,6 +64,7 @@
           page-visibility="[[pageVisibility]]"
           show-apps="[[showApps]]"
           show-android-apps="[[showAndroidApps]]"
+          show-assistant="[[showAssistant]]"
           show-kiosk-next-shell="[[showKioskNextShell]]"
           show-crostini="[[showCrostini]]"
           show-plugin-vm="[[showPluginVm]]"

chrome/browser/resources/settings/chromeos/os_settings_main/os_settings_main.js

@@ -83,6 +83,8 @@ Polymer({
 
     showAndroidApps: Boolean,
 
+    showAssistant: Boolean,
+
     havePlayStoreApp: Boolean,
   },
 

chrome/browser/resources/settings/chromeos/os_settings_menu/os_settings_menu.html

@@ -128,9 +128,10 @@
         <iron-icon icon="settings:laptop-chromebook"></iron-icon>
         $i18n{devicePageTitle}
       </a>
-      <a href="/search">
+      <!-- TODO(jamescook): Rename path to "/assistant". -->
+      <a href="/search" hidden="[[!showAssistant]]">
         <iron-icon icon="cr:search"></iron-icon>
-        $i18n{osSearchPageTitle}
+        $i18n{osAssistantPageTitle}
       </a>
       <a href="/apps" hidden="[[!showApps]]">
         <iron-icon icon="settings:apps"></iron-icon>

chrome/browser/resources/settings/chromeos/os_settings_page/os_settings_page.html

@@ -161,8 +161,8 @@
             </settings-device-page>
           </settings-section>
         </template>
-        <template is="dom-if" if="[[showPage_(pageVisibility.search)]]" restamp>
-          <settings-section page-title="$i18n{osSearchPageTitle}"
+        <template is="dom-if" if="[[showAssistant]]" restamp>
+          <settings-section page-title="$i18n{osAssistantPageTitle}"
               section="search">
             <os-settings-search-page prefs="{{prefs}}">
             </os-settings-search-page>

chrome/browser/resources/settings/chromeos/os_settings_page/os_settings_page.js

@@ -26,6 +26,8 @@ Polymer({
 
     showAndroidApps: Boolean,
 
+    showAssistant: Boolean,
+
     showCrostini: Boolean,
 
     allowCrostini_: Boolean,

chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.html

@@ -122,6 +122,7 @@
           <os-settings-menu page-visibility="[[pageVisibility_]]"
               show-apps="[[showApps_]]"
               show-android-apps="[[showAndroidApps_]]"
+              show-assistant="[[showAssistant_]]"
               show-crostini="[[showCrostini_]]"
               show-parental-controls="[[showParentalControls_]]"
               show-plugin-vm="[[showPluginVm_]]"
@@ -138,6 +139,7 @@
         <os-settings-menu page-visibility="[[pageVisibility_]]"
             show-apps="[[showApps_]]"
             show-android-apps="[[showAndroidApps_]]"
+            show-assistant="[[showAssistant_]]"
             show-crostini="[[showCrostini_]]"
             show-plugin-vm="[[showPluginVm_]]"
             show-multidevice="[[showMultidevice_]]"
@@ -151,6 +153,7 @@
           page-visibility="[[pageVisibility_]]"
           show-apps="[[showApps_]]"
           show-android-apps="[[showAndroidApps_]]"
+          show-assistant="[[showAssistant_]]"
           show-kiosk-next-shell="[[showKioskNextShell_]]"
           show-crostini="[[showCrostini_]]"
           show-parental-controls="[[showParentalControls_]]"

chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.js

@@ -74,6 +74,9 @@ Polymer({
     /** @private */
     showAndroidApps_: Boolean,
 
+    /** @private */
+    showAssistant_: Boolean,
+
     /** @private */
     showKioskNextShell_: Boolean,
 
@@ -167,6 +170,8 @@ Polymer({
 
     this.showApps_ = loadTimeData.getBoolean('showApps');
     this.showAndroidApps_ = loadTimeData.getBoolean('androidAppsVisible');
+    // Assistant can be disallowed due to flag, policy, locale, etc.
+    this.showAssistant_ = loadTimeData.getBoolean('isAssistantAllowed');
     this.showKioskNextShell_ = loadTimeData.valueExists('showKioskNextShell') &&
         loadTimeData.getBoolean('showKioskNextShell');
     this.showParentalControls_ =

chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc

@@ -63,7 +63,6 @@
 #if defined(OS_CHROMEOS)
 #include "ash/public/cpp/ash_switches.h"
 #include "ash/public/interfaces/voice_interaction_controller.mojom.h"
-#include "base/strings/strcat.h"
 #include "base/system/sys_info.h"
 #include "chrome/browser/chromeos/account_manager/account_manager_util.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
@@ -2309,9 +2308,7 @@ void AddSearchStrings(content::WebUIDataSource* html_source, Profile* profile) {
 #endif
     {"searchEnginesManage", IDS_SETTINGS_SEARCH_MANAGE_SEARCH_ENGINES},
 #if defined(OS_CHROMEOS)
-    {"osSearchPageTitle", is_assistant_allowed
-                              ? IDS_SETTINGS_SEARCH_AND_ASSISTANT
-                              : IDS_SETTINGS_SEARCH},
+    {"osAssistantPageTitle", IDS_OS_SETTINGS_ASSISTANT},
     {"searchGoogleAssistant", IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT},
     {"searchGoogleAssistantEnabled",
      IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_ENABLED},
@@ -2326,12 +2323,6 @@ void AddSearchStrings(content::WebUIDataSource* html_source, Profile* profile) {
       base::ASCIIToUTF16(chrome::kOmniboxLearnMoreURL));
   html_source->AddString("searchExplanation", search_explanation_text);
 #if defined(OS_CHROMEOS)
-  std::string settings_search_url =
-      base::StrCat({chrome::kChromeUISettingsURL, chrome::kSearchSubPage});
-  html_source->AddString(
-      "osSearchEngineLabel",
-      l10n_util::GetStringFUTF16(IDS_OS_SETTINGS_SEARCH_ENGINE_LABEL,
-                                 base::ASCIIToUTF16(settings_search_url)));
   html_source->AddBoolean("isAssistantAllowed", is_assistant_allowed);
 #endif
 }