cros: Make folder and desk rename textfields handle light/dark mode.

This CL changes hardcoded values to use their respective color
providers, allowing them to handle light/dark mode.

Test: manual
Bug: 1127498
Change-Id: I81b7a877dc0aff37d2fe080e6ee15ff73c094704
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2444489
Commit-Queue: Jeremy Chinsen <chinsenj@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813291}

ash/app_list/app_list_color_provider_impl.cc

@@ -125,6 +125,19 @@ SkColor AppListColorProviderImpl::GetFolderNameBackgroundColor(
                      ripple_attributes.inkdrop_opacity * 255);
 }
 
+SkColor AppListColorProviderImpl::GetFolderNameBorderColor(bool active) const {
+  if (!active)
+    return SK_ColorTRANSPARENT;
+
+  return ash_color_provider_->GetControlsLayerColor(
+      AshColorProvider::ControlsLayerType::kFocusRingColor);
+}
+
+SkColor AppListColorProviderImpl::GetFolderNameSelectionColor() const {
+  return ash_color_provider_->GetControlsLayerColor(
+      AshColorProvider::ControlsLayerType::kFocusAuraColor);
+}
+
 SkColor AppListColorProviderImpl::GetContentsBackgroundColor() const {
   return ash_color_provider_->GetControlsLayerColor(
       AshColorProvider::ControlsLayerType::kControlBackgroundColorInactive);

ash/app_list/app_list_color_provider_impl.h

@@ -36,6 +36,8 @@ class AppListColorProviderImpl : public AppListColorProvider {
   SkColor GetFolderTitleTextColor() const override;
   SkColor GetFolderHintTextColor() const override;
   SkColor GetFolderNameBackgroundColor(bool active) const override;
+  SkColor GetFolderNameBorderColor(bool active) const override;
+  SkColor GetFolderNameSelectionColor() const override;
   SkColor GetContentsBackgroundColor() const override;
   SkColor GetSeparatorColor() const override;
   SkColor GetSearchResultViewHighlightColor() const override;

ash/app_list/test/test_app_list_color_provider.cc

@@ -92,6 +92,17 @@ SkColor TestAppListColorProvider::GetFolderNameBackgroundColor(
   return SkColorSetA(SK_ColorBLACK, 0x0F);
 }
 
+SkColor TestAppListColorProvider::GetFolderNameBorderColor(bool active) const {
+  if (!active)
+    return SK_ColorTRANSPARENT;
+
+  return SkColorSetA(SK_ColorBLACK, 0x0F);
+}
+
+SkColor TestAppListColorProvider::GetFolderNameSelectionColor() const {
+  return SkColorSetA(SK_ColorBLACK, 0x0F);
+}
+
 SkColor TestAppListColorProvider::GetContentsBackgroundColor() const {
   return gfx::kGoogleGrey200;
 }

ash/app_list/test/test_app_list_color_provider.h

@@ -36,6 +36,8 @@ class TestAppListColorProvider : public AppListColorProvider {
   SkColor GetFolderTitleTextColor() const override;
   SkColor GetFolderHintTextColor() const override;
   SkColor GetFolderNameBackgroundColor(bool active) const override;
+  SkColor GetFolderNameBorderColor(bool active) const override;
+  SkColor GetFolderNameSelectionColor() const override;
   SkColor GetContentsBackgroundColor() const override;
   SkColor GetSeparatorColor() const override;
   SkColor GetSearchResultViewHighlightColor() const override;

ash/app_list/views/folder_header_view.cc

@@ -40,10 +40,8 @@ class FolderHeaderView::FolderNameView : public views::Textfield,
     // Make folder name font size 14px.
     SetFontList(
         ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(2));
-    SetTextColor(AppListColorProvider::Get()->GetFolderTitleTextColor());
     set_placeholder_text_color(
         AppListColorProvider::Get()->GetFolderHintTextColor());
-    SetNameViewBorderAndBackground(/*is_active=*/false);
     SetEventTargeter(std::make_unique<views::ViewTargeter>(this));
   }
 
@@ -54,18 +52,31 @@ class FolderHeaderView::FolderNameView : public views::Textfield,
                      AppListConfig::instance().folder_header_height());
   }
 
+  void OnThemeChanged() override {
+    Textfield::OnThemeChanged();
+
+    const bool is_active = has_mouse_already_entered_ || HasFocus();
+    AppListColorProvider* color_provider = AppListColorProvider::Get();
+    SetBackground(views::CreateRoundedRectBackground(
+        color_provider->GetFolderNameBackgroundColor(is_active),
+        AppListConfig::instance().folder_name_border_radius()));
+
+    const SkColor text_color = color_provider->GetFolderTitleTextColor();
+    SetTextColor(text_color);
+    SetSelectionTextColor(text_color);
+    SetSelectionBackgroundColor(color_provider->GetFolderNameSelectionColor());
+    SetNameViewBorderAndBackground(is_active);
+  }
+
   void SetNameViewBorderAndBackground(bool is_active) {
     int horizontal_padding = AppListConfig::instance().folder_name_padding();
     SetBorder(views::CreatePaddedBorder(
         views::CreateRoundedRectBorder(
             AppListConfig::instance().folder_name_border_thickness(),
             AppListConfig::instance().folder_name_border_radius(),
-            is_active ? AppListConfig::instance().folder_name_border_color()
-                      : SK_ColorTRANSPARENT),
+            AppListColorProvider::Get()->GetFolderNameBorderColor(is_active)),
         gfx::Insets(0, horizontal_padding)));
-
-    SetBackgroundColor(
-        AppListColorProvider::Get()->GetFolderNameBackgroundColor(is_active));
+    UpdateBackgroundColor(is_active);
   }
 
   void OnFocus() override {
@@ -126,11 +137,8 @@ class FolderHeaderView::FolderNameView : public views::Textfield,
   }
 
   void OnMouseExited(const ui::MouseEvent& event) override {
-    if (!HasFocus()) {
-      SetBackgroundColor(
-          AppListColorProvider::Get()->GetFolderNameBackgroundColor(
-              /*is_active=*/false));
-    }
+    if (!HasFocus())
+      UpdateBackgroundColor(/*is_active=*/false);
 
     has_mouse_already_entered_ = false;
   }
@@ -139,18 +147,13 @@ class FolderHeaderView::FolderNameView : public views::Textfield,
     if (DoesMouseEventActuallyIntersect(event) && !has_mouse_already_entered_) {
       // If this is reached, the mouse is entering the view.
       // Recreate border to have custom corner radius.
-      SetBackground(views::CreateRoundedRectBackground(
-          AppListColorProvider::Get()->GetFolderNameBackgroundColor(
-              /*is_active=*/true),
-          AppListConfig::instance().folder_name_border_radius()));
+      UpdateBackgroundColor(/*is_active=*/true);
       has_mouse_already_entered_ = true;
     } else if (!DoesMouseEventActuallyIntersect(event) &&
                has_mouse_already_entered_ && !HasFocus()) {
       // If this is reached, the mouse is exiting the view on its horizontal
       // edges.
-      SetBackgroundColor(
-          AppListColorProvider::Get()->GetFolderNameBackgroundColor(
-              /*is_active=*/false));
+      UpdateBackgroundColor(/*is_active=*/false);
       has_mouse_already_entered_ = false;
     }
   }
@@ -183,6 +186,12 @@ class FolderHeaderView::FolderNameView : public views::Textfield,
   }
 
  private:
+  void UpdateBackgroundColor(bool is_active) {
+    background()->SetNativeControlColor(
+        AppListColorProvider::Get()->GetFolderNameBackgroundColor(is_active));
+    SchedulePaint();
+  }
+
   // The parent FolderHeaderView, owns this.
   FolderHeaderView* folder_header_view_;
 

ash/public/cpp/app_list/app_list_color_provider.h

@@ -35,6 +35,8 @@ class ASH_PUBLIC_EXPORT AppListColorProvider {
   virtual SkColor GetFolderTitleTextColor() const = 0;
   virtual SkColor GetFolderHintTextColor() const = 0;
   virtual SkColor GetFolderNameBackgroundColor(bool active) const = 0;
+  virtual SkColor GetFolderNameBorderColor(bool active) const = 0;
+  virtual SkColor GetFolderNameSelectionColor() const = 0;
   virtual SkColor GetContentsBackgroundColor() const = 0;
   virtual SkColor GetSeparatorColor() const = 0;
   virtual SkColor GetSearchResultViewHighlightColor() const = 0;

ash/public/cpp/app_list/app_list_config.cc

@@ -300,7 +300,6 @@ AppListConfig::AppListConfig(AppListConfigType type)
       folder_name_border_radius_(4),
       folder_name_border_thickness_(2),
       folder_name_padding_(8),
-      folder_name_border_color_(gfx::kGoogleBlue600),
       folder_icon_dimension_(FolderClippedIconDimensionForType(type)),
       folder_unclipped_icon_dimension_(
           FolderUnclippedIconDimensionForType(type)),
@@ -431,7 +430,6 @@ AppListConfig::AppListConfig(const AppListConfig& base_config,
       folder_name_border_radius_(base_config.folder_name_border_radius_),
       folder_name_border_thickness_(base_config.folder_name_border_thickness_),
       folder_name_padding_(base_config.folder_name_padding_),
-      folder_name_border_color_(base_config.folder_name_border_color_),
       folder_icon_dimension_(MinScale(base_config.folder_icon_dimension_,
                                       scale_x,
                                       inner_tile_scale_y)),

ash/public/cpp/app_list/app_list_config.h

@@ -126,7 +126,6 @@ class ASH_PUBLIC_EXPORT AppListConfig {
     return folder_name_border_thickness_;
   }
   int folder_name_padding() const { return folder_name_padding_; }
-  SkColor folder_name_border_color() const { return folder_name_border_color_; }
   int folder_icon_dimension() const { return folder_icon_dimension_; }
   int folder_unclipped_icon_dimension() const {
     return folder_unclipped_icon_dimension_;
@@ -401,9 +400,6 @@ class ASH_PUBLIC_EXPORT AppListConfig {
   // The inner padding for folder name.
   const int folder_name_padding_;
 
-  // The color of the folder name border.
-  const SkColor folder_name_border_color_;
-
   // The icon dimension of folder.
   const int folder_icon_dimension_;
 

ash/style/ash_color_provider.cc

@@ -148,6 +148,7 @@ SkColor AshColorProvider::GetControlsLayerColor(ControlsLayerType type) const {
                                       gfx::kGoogleRed600,
                                       gfx::kGoogleYellow600,
                                       gfx::kGoogleGreen600,
+                                      SkColorSetA(gfx::kGoogleBlue600, 0x3D),
                                       gfx::kGoogleBlue600};
   constexpr SkColor kDarkColors[] = {SkColorSetA(SK_ColorWHITE, 0x24),
                                      gfx::kGoogleBlue300,
@@ -155,6 +156,7 @@ SkColor AshColorProvider::GetControlsLayerColor(ControlsLayerType type) const {
                                      gfx::kGoogleRed300,
                                      gfx::kGoogleYellow300,
                                      gfx::kGoogleGreen300,
+                                     SkColorSetA(gfx::kGoogleBlue300, 0x3D),
                                      gfx::kGoogleBlue300};
   DCHECK(base::size(kLightColors) == base::size(kDarkColors));
   static_assert(

ash/style/ash_color_provider.h

@@ -74,6 +74,7 @@ class ASH_EXPORT AshColorProvider : public SessionObserver {
     kControlBackgroundColorAlert,
     kControlBackgroundColorWarning,
     kControlBackgroundColorPositive,
+    kFocusAuraColor,
     kFocusRingColor,
   };
 

ash/wm/desks/desk_name_view.cc

@@ -52,16 +52,6 @@ DeskNameView::DeskNameView() {
   border_ptr_ = border.get();
   SetBorder(std::move(border));
 
-  const SkColor text_color = AshColorProvider::Get()->GetContentLayerColor(
-      AshColorProvider::ContentLayerType::kTextColorPrimary);
-  SetTextColor(text_color);
-  SetSelectionTextColor(text_color);
-
-  const SkColor selection_color =
-      AshColorProvider::Get()->GetControlsLayerColor(
-          AshColorProvider::ControlsLayerType::kFocusRingColor);
-  SetSelectionBackgroundColor(selection_color);
-
   SetCursorEnabled(true);
   SetHorizontalAlignment(gfx::HorizontalAlignment::ALIGN_CENTER);
 }
@@ -137,8 +127,19 @@ void DeskNameView::OnMouseExited(const ui::MouseEvent& event) {
 
 void DeskNameView::OnThemeChanged() {
   Textfield::OnThemeChanged();
+
   SetBackground(views::CreateRoundedRectBackground(GetBackgroundColor(),
                                                    kDeskNameViewBorderRadius));
+
+  AshColorProvider* color_provider = AshColorProvider::Get();
+  const SkColor text_color = color_provider->GetContentLayerColor(
+      AshColorProvider::ContentLayerType::kTextColorPrimary);
+  SetTextColor(text_color);
+  SetSelectionTextColor(text_color);
+
+  const SkColor selection_color = color_provider->GetControlsLayerColor(
+      AshColorProvider::ControlsLayerType::kFocusAuraColor);
+  SetSelectionBackgroundColor(selection_color);
 }
 
 views::View* DeskNameView::GetView() {