CrOS Settings: Update icon for language search results
The icon for language search results should match the new icon used
in the language settings row.
OsSettingsRevampWayfinding feature
- enabled: http://screen/39pD5wSHCjvd64L.png
- disabled: http://screen/3pzRX9wbmRRcYr8.png
Bug: b:311201917
Change-Id: I1e48f599e848b58802ef14f14534e66d2a8e07e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5053501
Commit-Queue: Wes Okuhara <wesokuhara@google.com>
Reviewed-by: Connie Xu <conniekxu@chromium.org>
Reviewed-by: Matthew Denton <mpdenton@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1230094}
diff --git a/chrome/browser/resources/ash/settings/os_settings_search_box/os_search_result_row.ts b/chrome/browser/resources/ash/settings/os_settings_search_box/os_search_result_row.ts
index 4240d31..2dd8d58 100644
--- a/chrome/browser/resources/ash/settings/os_settings_search_box/os_search_result_row.ts
+++ b/chrome/browser/resources/ash/settings/os_settings_search_box/os_search_result_row.ts
@@ -726,8 +726,6 @@
return 'os-settings:fullscreen-magnifier';
case SearchResultIcon.kGeolocation:
return 'os-settings:geolocation';
- case SearchResultIcon.kGlobe:
- return 'os-settings:language';
case SearchResultIcon.kGooglePlay:
return 'os-settings:google-play';
case SearchResultIcon.kHotspot:
@@ -736,6 +734,9 @@
return 'os-settings:magic-tethering';
case SearchResultIcon.kKeyboard:
return 'os-settings:keyboard';
+ case SearchResultIcon.kLanguage:
+ return isRevampEnabled ? 'os-settings:language-revamp' :
+ 'os-settings:language';
case SearchResultIcon.kLaptop:
return 'os-settings:laptop-chromebook';
case SearchResultIcon.kLock:
diff --git a/chrome/browser/ui/webui/ash/settings/pages/device/inputs_section.cc b/chrome/browser/ui/webui/ash/settings/pages/device/inputs_section.cc
index fcb7bcb..24655dc 100644
--- a/chrome/browser/ui/webui/ash/settings/pages/device/inputs_section.cc
+++ b/chrome/browser/ui/webui/ash/settings/pages/device/inputs_section.cc
@@ -43,13 +43,13 @@
static const base::NoDestructor<std::vector<SearchConcept>> tags({
{IDS_OS_SETTINGS_TAG_INPUT,
mojom::kInputSubpagePath,
- mojom::SearchResultIcon::kGlobe,
+ mojom::SearchResultIcon::kLanguage,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSubpage,
{.subpage = mojom::Subpage::kInput}},
{IDS_OS_SETTINGS_TAG_LANGUAGES_INPUT_INPUT_OPTIONS_SHELF,
mojom::kInputSubpagePath,
- mojom::SearchResultIcon::kGlobe,
+ mojom::SearchResultIcon::kLanguage,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSetting,
{.setting = mojom::Setting::kShowInputOptionsInShelf},
@@ -57,13 +57,13 @@
SearchConcept::kAltTagEnd}},
{IDS_OS_SETTINGS_TAG_LANGUAGES_ADD_INPUT_METHOD,
mojom::kInputSubpagePath,
- mojom::SearchResultIcon::kGlobe,
+ mojom::SearchResultIcon::kLanguage,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSetting,
{.setting = mojom::Setting::kAddInputMethod}},
{IDS_OS_SETTINGS_TAG_LANGUAGES_SPELL_CHECK,
mojom::kInputSubpagePath,
- mojom::SearchResultIcon::kGlobe,
+ mojom::SearchResultIcon::kLanguage,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSetting,
{.setting = mojom::Setting::kSpellCheck}},
@@ -75,7 +75,7 @@
static const base::NoDestructor<std::vector<SearchConcept>> tags({
{IDS_OS_SETTINGS_TAG_LANGUAGES_SUGGESTIONS,
mojom::kInputSubpagePath,
- mojom::SearchResultIcon::kGlobe,
+ mojom::SearchResultIcon::kLanguage,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSubpage,
{.subpage = mojom::Subpage::kInput}},
@@ -87,7 +87,7 @@
static const base::NoDestructor<std::vector<SearchConcept>> tags({
{IDS_OS_SETTINGS_TAG_LANGUAGES_EMOJI_SUGGESTIONS,
mojom::kInputSubpagePath,
- mojom::SearchResultIcon::kGlobe,
+ mojom::SearchResultIcon::kLanguage,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSetting,
{.setting = mojom::Setting::kShowEmojiSuggestions}},
@@ -99,7 +99,7 @@
static const base::NoDestructor<std::vector<SearchConcept>> tags({
{IDS_OS_SETTINGS_TAG_LANGUAGES_EDIT_DICTIONARY,
mojom::kEditDictionarySubpagePath,
- mojom::SearchResultIcon::kGlobe,
+ mojom::SearchResultIcon::kLanguage,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSubpage,
{.subpage = mojom::Subpage::kEditDictionary}},
@@ -111,7 +111,7 @@
static const base::NoDestructor<std::vector<SearchConcept>> tags({
{IDS_OS_SETTINGS_TAG_LANGUAGES_AUTO_CORRECTION,
mojom::kInputMethodOptionsSubpagePath,
- mojom::SearchResultIcon::kGlobe,
+ mojom::SearchResultIcon::kLanguage,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSetting,
{.setting = mojom::Setting::kShowPKAutoCorrection}},
@@ -516,7 +516,7 @@
}
mojom::SearchResultIcon InputsSection::GetSectionIcon() const {
- return mojom::SearchResultIcon::kGlobe;
+ return mojom::SearchResultIcon::kLanguage;
}
const char* InputsSection::GetSectionPath() const {
@@ -534,8 +534,8 @@
void InputsSection::RegisterHierarchy(HierarchyGenerator* generator) const {
generator->RegisterTopLevelSubpage(
IDS_OS_SETTINGS_LANGUAGES_INPUT_PAGE_TITLE_V2, mojom::Subpage::kInput,
- mojom::SearchResultIcon::kGlobe, mojom::SearchResultDefaultRank::kMedium,
- mojom::kInputSubpagePath);
+ mojom::SearchResultIcon::kLanguage,
+ mojom::SearchResultDefaultRank::kMedium, mojom::kInputSubpagePath);
static constexpr mojom::Setting kInputSubpageSettings[] = {
mojom::Setting::kAddInputMethod,
mojom::Setting::kShowEmojiSuggestions,
@@ -550,21 +550,24 @@
generator->RegisterNestedSubpage(
IDS_OS_SETTINGS_LANGUAGES_EDIT_DICTIONARY_LABEL,
mojom::Subpage::kEditDictionary, mojom::Subpage::kInput,
- mojom::SearchResultIcon::kGlobe, mojom::SearchResultDefaultRank::kMedium,
+ mojom::SearchResultIcon::kLanguage,
+ mojom::SearchResultDefaultRank::kMedium,
mojom::kEditDictionarySubpagePath);
// Japanese Manage User Dictionary subpage
generator->RegisterNestedSubpage(
IDS_OS_SETTINGS_LANGUAGES_JAPANESE_MANAGE_USER_DICTIONARY_LABEL,
mojom::Subpage::kJapaneseManageUserDictionary, mojom::Subpage::kInput,
- mojom::SearchResultIcon::kGlobe, mojom::SearchResultDefaultRank::kMedium,
+ mojom::SearchResultIcon::kLanguage,
+ mojom::SearchResultDefaultRank::kMedium,
mojom::kJapaneseManageUserDictionarySubpagePath);
// Input method options subpage
generator->RegisterNestedSubpage(
IDS_SETTINGS_LANGUAGES_INPUT_METHOD_OPTIONS_TITLE,
mojom::Subpage::kInputMethodOptions, mojom::Subpage::kInput,
- mojom::SearchResultIcon::kGlobe, mojom::SearchResultDefaultRank::kMedium,
+ mojom::SearchResultIcon::kLanguage,
+ mojom::SearchResultDefaultRank::kMedium,
mojom::kInputMethodOptionsSubpagePath);
static constexpr mojom::Setting kInputMethodOptionsSubpageSettings[] = {
mojom::Setting::kShowPKAutoCorrection,
diff --git a/chrome/browser/ui/webui/ash/settings/pages/languages/languages_section.cc b/chrome/browser/ui/webui/ash/settings/pages/languages/languages_section.cc
index e5d55b4..2b9d57dc 100644
--- a/chrome/browser/ui/webui/ash/settings/pages/languages/languages_section.cc
+++ b/chrome/browser/ui/webui/ash/settings/pages/languages/languages_section.cc
@@ -42,25 +42,25 @@
static const base::NoDestructor<std::vector<SearchConcept>> tags({
{IDS_OS_SETTINGS_TAG_LANGUAGES,
mojom::kLanguagesSubpagePath,
- mojom::SearchResultIcon::kGlobe,
+ mojom::SearchResultIcon::kLanguage,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSubpage,
{.subpage = mojom::Subpage::kLanguages}},
{IDS_OS_SETTINGS_TAG_LANGUAGES_CHANGE_DEVICE_LANGUAGE,
mojom::kLanguagesSubpagePath,
- mojom::SearchResultIcon::kGlobe,
+ mojom::SearchResultIcon::kLanguage,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSetting,
{.setting = mojom::Setting::kChangeDeviceLanguage}},
{IDS_OS_SETTINGS_TAG_LANGUAGES_INPUT_ADD_LANGUAGE,
mojom::kLanguagesSubpagePath,
- mojom::SearchResultIcon::kGlobe,
+ mojom::SearchResultIcon::kLanguage,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSetting,
{.setting = mojom::Setting::kAddLanguage}},
{IDS_OS_SETTINGS_TAG_LANGUAGES_OFFER_TRANSLATION,
mojom::kLanguagesSubpagePath,
- mojom::SearchResultIcon::kGlobe,
+ mojom::SearchResultIcon::kLanguage,
mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSetting,
{.setting = mojom::Setting::kOfferTranslation}},
@@ -193,7 +193,7 @@
}
mojom::SearchResultIcon LanguagesSection::GetSectionIcon() const {
- return mojom::SearchResultIcon::kGlobe;
+ return mojom::SearchResultIcon::kLanguage;
}
const char* LanguagesSection::GetSectionPath() const {
@@ -212,7 +212,7 @@
// Languages.
generator->RegisterTopLevelSubpage(
IDS_OS_SETTINGS_LANGUAGES_LANGUAGES_PAGE_TITLE,
- mojom::Subpage::kLanguages, mojom::SearchResultIcon::kGlobe,
+ mojom::Subpage::kLanguages, mojom::SearchResultIcon::kLanguage,
mojom::SearchResultDefaultRank::kMedium, mojom::kLanguagesSubpagePath);
static constexpr mojom::Setting kLanguagesPageSettings[] = {
mojom::Setting::kAddLanguage,
diff --git a/chrome/browser/ui/webui/ash/settings/search/mojom/search_result_icon.mojom b/chrome/browser/ui/webui/ash/settings/search/mojom/search_result_icon.mojom
index 1b338d2f..ca4bb8e 100644
--- a/chrome/browser/ui/webui/ash/settings/search/mojom/search_result_icon.mojom
+++ b/chrome/browser/ui/webui/ash/settings/search/mojom/search_result_icon.mojom
@@ -31,11 +31,11 @@
kFolder,
kFullscreenMagnifier,
kGeolocation,
- kGlobe,
kGooglePlay,
kHotspot,
kInstantTethering,
kKeyboard,
+ kLanguage,
kLaptop,
kLock,
kMagnifyingGlass,
