Update search box colors for peeking and fullscreen launcher.

We will be using primary colors for inactive search box placeholder text
and secondary colors for active search box placeholder text.

Bug: 1156231
Change-Id: I1285bb3f6630e103bfd1cf192e9065d248614b07
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2581023Reviewed-by: Toni Baržić <tbarzic@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835294}

ash/app_list/app_list_color_provider_impl.cc

@@ -68,12 +68,6 @@ SkColor AppListColorProviderImpl::GetSearchBoxCardBackgroundColor() const {
                                      /*default_color*/ SK_ColorWHITE);
 }
 
-SkColor AppListColorProviderImpl::GetSearchBoxPlaceholderTextColor() const {
-  return DeprecatedGetContentLayerColor(
-      AshColorProvider::ContentLayerType::kTextColorSecondary,
-      /*default_color*/ SkColorSetARGB(0xDE, 0x00, 0x00, 0x00));
-}
-
 SkColor AppListColorProviderImpl::GetSearchBoxTextColor(
     SkColor default_color) const {
   return DeprecatedGetContentLayerColor(

ash/app_list/app_list_color_provider_impl.h

@@ -22,7 +22,6 @@ class AppListColorProviderImpl : public AppListColorProvider {
   SkColor GetAppListBackgroundColor() const override;
   SkColor GetSearchBoxBackgroundColor() const override;
   SkColor GetSearchBoxSecondaryTextColor(SkColor default_color) const override;
-  SkColor GetSearchBoxPlaceholderTextColor() const override;
   SkColor GetSearchBoxTextColor(SkColor default_color) const override;
   SkColor GetSuggestionChipBackgroundColor() const override;
   SkColor GetSuggestionChipTextColor() const override;

ash/app_list/views/search_box_view.cc

@@ -402,7 +402,8 @@ void SearchBoxView::OnWallpaperColorsChanged() {
   UpdateSearchIcon();
   AppListColorProvider* app_list_color_provider = AppListColorProvider::Get();
   search_box()->set_placeholder_text_color(
-      app_list_color_provider->GetSearchBoxPlaceholderTextColor());
+      app_list_color_provider->GetSearchBoxTextColor(
+          kDeprecatedSearchBoxPlaceholderTextColor));
   search_box()->SetTextColor(app_list_color_provider->GetSearchBoxTextColor(
       kDeprecatedSearchBoxTextDefaultColor));
   if (features::IsDarkLightModeEnabled()) {

ash/public/cpp/app_list/app_list_color_provider.h

@@ -13,6 +13,9 @@ namespace ash {
 constexpr SkColor kDeprecatedSearchBoxTextDefaultColor =
     SkColorSetRGB(0x33, 0x33, 0x33);
 
+constexpr SkColor kDeprecatedSearchBoxPlaceholderTextColor =
+    SkColorSetARGB(0xDE, 0x00, 0x00, 0x00);
+
 class ASH_PUBLIC_EXPORT AppListColorProvider {
  public:
   // Returns the singleton instance.
@@ -23,7 +26,6 @@ class ASH_PUBLIC_EXPORT AppListColorProvider {
   virtual SkColor GetExpandArrowIconBackgroundColor() const = 0;
   virtual SkColor GetAppListBackgroundColor() const = 0;
   virtual SkColor GetSearchBoxBackgroundColor() const = 0;
-  virtual SkColor GetSearchBoxPlaceholderTextColor() const = 0;
   virtual SkColor GetSearchBoxTextColor(SkColor default_color) const = 0;
   virtual SkColor GetSearchBoxSecondaryTextColor(
       SkColor default_color) const = 0;

ash/public/cpp/test/test_app_list_color_provider.cc

@@ -32,10 +32,6 @@ SkColor TestAppListColorProvider::GetSearchBoxCardBackgroundColor() const {
   return gfx::kGoogleGrey900;
 }
 
-SkColor TestAppListColorProvider::GetSearchBoxPlaceholderTextColor() const {
-  return gfx::kGoogleGrey500;
-}
-
 SkColor TestAppListColorProvider::GetSearchBoxTextColor(
     SkColor default_color) const {
   return gfx::kGoogleGrey200;

ash/public/cpp/test/test_app_list_color_provider.h

@@ -21,7 +21,6 @@ class TestAppListColorProvider : public AppListColorProvider {
   SkColor GetExpandArrowIconBackgroundColor() const override;
   SkColor GetAppListBackgroundColor() const override;
   SkColor GetSearchBoxBackgroundColor() const override;
-  SkColor GetSearchBoxPlaceholderTextColor() const override;
   SkColor GetSearchBoxTextColor(SkColor default_color) const override;
   SkColor GetSearchBoxSecondaryTextColor(SkColor default_color) const override;
   SkColor GetSuggestionChipBackgroundColor() const override;

ash/search_box/search_box_view_base.cc

@@ -345,9 +345,10 @@ void SearchBoxViewBase::SetSearchBoxActive(bool active,
                                     : gfx::Canvas::TEXT_ALIGN_LEFT)
              : gfx::Canvas::TEXT_ALIGN_CENTER);
   search_box_->set_placeholder_text_color(
-      ash::AppListColorProvider::Get()->GetSearchBoxSecondaryTextColor(
-          active ? kZeroQuerySearchboxColor
-                 : kDefaultSearchboxPlaceholderTextColor));
+      active ? AppListColorProvider::Get()->GetSearchBoxSecondaryTextColor(
+                   kDefaultSearchboxPlaceholderTextColor)
+             : ash::AppListColorProvider::Get()->GetSearchBoxTextColor(
+                   kZeroQuerySearchboxColor));
   search_box_->SetCursorEnabled(active);
 
   if (active) {