Add support for dark/light mode in tray buttons

The shelf tray buttons do not currently change
color properly after login.

Bug: 1110762
Change-Id: Ic1f95c1ee0e4048633b0ecbff6f3a15951afaacd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2496742
Commit-Queue: Ahmed Mehfooz <amehfooz@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Min Chen <minch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826621}

ash/capture_mode/stop_recording_button_tray.cc

@@ -22,7 +22,9 @@ StopRecordingButtonTray::StopRecordingButtonTray(Shelf* shelf)
     : TrayBackgroundView(shelf) {
   auto image_view = std::make_unique<views::ImageView>();
   image_view->SetImage(gfx::CreateVectorIcon(
-      kCaptureModeCircleStopIcon, ShelfConfig::Get()->shelf_icon_color()));
+      kCaptureModeCircleStopIcon,
+      AshColorProvider::Get()->GetContentLayerColor(
+          AshColorProvider::ContentLayerType::kIconColorPrimary)));
   image_view->SetTooltipText(GetAccessibleNameForTray());
   image_view->SetHorizontalAlignment(views::ImageView::Alignment::kCenter);
   image_view->SetVerticalAlignment(views::ImageView::Alignment::kCenter);

ash/login/ui/note_action_launch_button.cc

@@ -188,8 +188,10 @@ class NoteActionLaunchButton::ActionButton : public views::ImageButton {
     SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ASH_STYLUS_TOOLS_CREATE_NOTE_ACTION));
     SetImage(views::Button::STATE_NORMAL,
-             CreateVectorIcon(kTrayActionNewLockScreenNoteIcon,
-                              ShelfConfig::Get()->shelf_icon_color()));
+             CreateVectorIcon(
+                 kTrayActionNewLockScreenNoteIcon,
+                 AshColorProvider::Get()->GetContentLayerColor(
+                     AshColorProvider::ContentLayerType::kButtonIconColor)));
     SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
     SetFocusPainter(nullptr);
     SetFlipCanvasOnPaintForRTLUI(true);

ash/public/cpp/shelf_config.h

@@ -131,9 +131,6 @@ class ASH_EXPORT ShelfConfig : public TabletModeObserver,
   // if the shelf visibility should change during a drag.
   float drag_hide_ratio_threshold() const;
 
-  SkColor shelf_control_permanent_highlight_background() const {
-    return shelf_control_permanent_highlight_background_;
-  }
   SkColor shelf_focus_border_color() const { return shelf_focus_border_color_; }
   int workspace_area_visible_inset() const {
     return workspace_area_visible_inset_;
@@ -144,7 +141,6 @@ class ASH_EXPORT ShelfConfig : public TabletModeObserver,
   int hidden_shelf_in_screen_portion() const {
     return hidden_shelf_in_screen_portion_;
   }
-  SkColor shelf_icon_color() const { return shelf_icon_color_; }
   int status_indicator_offset_from_shelf_edge() const {
     return status_indicator_offset_from_shelf_edge_;
   }
@@ -282,8 +278,6 @@ class ASH_EXPORT ShelfConfig : public TabletModeObserver,
   const int app_icon_group_margin_tablet_;
   const int app_icon_group_margin_clamshell_;
 
-  const SkColor shelf_control_permanent_highlight_background_;
-
   const SkColor shelf_focus_border_color_;
 
   // We reserve a small area on the edge of the workspace area to ensure that
@@ -297,10 +291,6 @@ class ASH_EXPORT ShelfConfig : public TabletModeObserver,
   // Portion of the shelf that's within the screen bounds when auto-hidden.
   const int hidden_shelf_in_screen_portion_;
 
-  // The foreground color of the icons used in the shelf (launcher,
-  // notifications, etc).
-  const SkColor shelf_icon_color_;
-
   // The distance between the edge of the shelf and the status indicators.
   const int status_indicator_offset_from_shelf_edge_;
 

ash/shelf/shelf_config.cc

@@ -118,13 +118,10 @@ ShelfConfig::ShelfConfig()
       shelf_status_area_hit_region_padding_dense_(2),
       app_icon_group_margin_tablet_(16),
       app_icon_group_margin_clamshell_(12),
-      shelf_control_permanent_highlight_background_(
-          SkColorSetA(SK_ColorWHITE, 26)),  // 10%
       shelf_focus_border_color_(gfx::kGoogleBlue300),
       workspace_area_visible_inset_(2),
       workspace_area_auto_hide_inset_(5),
       hidden_shelf_in_screen_portion_(3),
-      shelf_icon_color_(SK_ColorWHITE),
       status_indicator_offset_from_shelf_edge_(1),
       scrollable_shelf_ripple_padding_(2),
       shelf_tooltip_preview_height_(128),
@@ -424,7 +421,8 @@ SkColor ShelfConfig::GetShelfControlButtonColor() const {
   } else if (session_state == session_manager::SessionState::OOBE) {
     return SkColorSetA(SK_ColorBLACK, 16);  // 6% opacity
   }
-  return shelf_control_permanent_highlight_background_;
+  return AshColorProvider::Get()->GetControlsLayerColor(
+      AshColorProvider::ControlsLayerType::kControlBackgroundColorInactive);
 }
 
 SkColor ShelfConfig::GetShelfWithAppListColor() const {

ash/shelf/shelf_control_button.cc

@@ -92,8 +92,7 @@ void ShelfControlButton::PaintBackground(gfx::Canvas* canvas,
                                          const gfx::Rect& bounds) {
   cc::PaintFlags flags;
   flags.setAntiAlias(true);
-  flags.setColor(
-      ShelfConfig::Get()->shelf_control_permanent_highlight_background());
+  flags.setColor(ShelfConfig::Get()->GetShelfControlButtonColor());
   canvas->DrawRoundRect(bounds, ShelfConfig::Get()->control_border_radius(),
                         flags);
 }

ash/system/holding_space/holding_space_tray_icon.cc

@@ -95,9 +95,10 @@ void HoldingSpaceTrayIcon::InitLayout() {
   // that tooltips will be retrieved from `this` instead.
   no_previews_image_view_ = AddChildView(std::make_unique<views::ImageView>());
   no_previews_image_view_->SetCanProcessEventsWithinSubtree(false);
-  no_previews_image_view_->SetImage(
-      gfx::CreateVectorIcon(kHoldingSpaceIcon, kHoldingSpaceTrayIconSize,
-                            ShelfConfig::Get()->shelf_icon_color()));
+  no_previews_image_view_->SetImage(gfx::CreateVectorIcon(
+      kHoldingSpaceIcon, kHoldingSpaceTrayIconSize,
+      AshColorProvider::Get()->GetContentLayerColor(
+          AshColorProvider::ContentLayerType::kIconColorPrimary)));
 
   if (features::IsTemporaryHoldingSpacePreviewsEnabled()) {
     // As holding space items are added to the model, child layers will be added

ash/system/ime_menu/ime_menu_tray.cc

@@ -401,6 +401,11 @@ bool ImeMenuTray::ShouldShowKeyboardToggle() const {
                                       .enabled();
 }
 
+void ImeMenuTray::OnThemeChanged() {
+  TrayBackgroundView::OnThemeChanged();
+  UpdateTrayLabel();
+}
+
 base::string16 ImeMenuTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME);
 }
@@ -524,6 +529,10 @@ void ImeMenuTray::UpdateTrayLabel() {
 
   // Updates the tray label based on the current input method.
   CreateLabel();
+
+  label_->SetEnabledColor(AshColorProvider::Get()->GetContentLayerColor(
+      AshColorProvider::ContentLayerType::kIconColorPrimary));
+
   if (current_ime.third_party)
     label_->SetText(current_ime.short_name + base::UTF8ToUTF16("*"));
   else

ash/system/ime_menu/ime_menu_tray.h

@@ -50,6 +50,7 @@ class ASH_EXPORT ImeMenuTray : public TrayBackgroundView,
   bool ShouldShowKeyboardToggle() const;
 
   // TrayBackgroundView:
+  void OnThemeChanged() override;
   base::string16 GetAccessibleNameForTray() override;
   void HandleLocaleChange() override;
   void HideBubbleWithView(const TrayBubbleView* bubble_view) override;

ash/system/palette/palette_tray.cc

@@ -21,6 +21,7 @@
 #include "ash/system/palette/palette_tool_manager.h"
 #include "ash/system/palette/palette_utils.h"
 #include "ash/system/palette/palette_welcome_bubble.h"
+#include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/tray/tray_container.h"
 #include "ash/system/tray/tray_popup_utils.h"
@@ -289,6 +290,11 @@ void PaletteTray::ClickedOutsideBubble() {
   HidePalette();
 }
 
+void PaletteTray::OnThemeChanged() {
+  TrayBackgroundView::OnThemeChanged();
+  UpdateTrayIcon();
+}
+
 base::string16 PaletteTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(IDS_ASH_STYLUS_TOOLS_TITLE);
 }
@@ -560,7 +566,9 @@ void PaletteTray::UpdateTrayIcon() {
   icon_->SetImage(CreateVectorIcon(
       palette_tool_manager_->GetActiveTrayIcon(
           palette_tool_manager_->GetActiveTool(PaletteGroup::MODE)),
-      kTrayIconSize, ShelfConfig::Get()->shelf_icon_color()));
+      kTrayIconSize,
+      AshColorProvider::Get()->GetContentLayerColor(
+          AshColorProvider::ContentLayerType::kIconColorPrimary)));
 }
 
 void PaletteTray::OnPaletteEnabledPrefChanged() {

ash/system/palette/palette_tray.h

@@ -72,6 +72,7 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView,
 
   // TrayBackgroundView:
   void ClickedOutsideBubble() override;
+  void OnThemeChanged() override;
   base::string16 GetAccessibleNameForTray() override;
   void HandleLocaleChange() override;
   void HideBubbleWithView(const TrayBubbleView* bubble_view) override;

ash/system/status_area_widget.cc

@@ -85,7 +85,6 @@ void StatusAreaWidget::Initialize() {
   DCHECK(!initialized_);
 
   // Create the child views, left to right.
-
   overflow_button_tray_ =
       std::make_unique<StatusAreaOverflowButtonTray>(shelf_);
   AddTrayButton(overflow_button_tray_.get());
@@ -506,10 +505,6 @@ void StatusAreaWidget::SchedulePaint() {
     tray_button->SchedulePaint();
 }
 
-const ui::NativeTheme* StatusAreaWidget::GetNativeTheme() const {
-  return ui::NativeTheme::GetInstanceForDarkUI();
-}
-
 bool StatusAreaWidget::OnNativeWidgetActivationChanged(bool active) {
   if (!Widget::OnNativeWidgetActivationChanged(active))
     return false;

ash/system/status_area_widget.h

@@ -151,7 +151,6 @@ class ASH_EXPORT StatusAreaWidget : public SessionObserver,
   void SchedulePaint();
 
   // Overridden from views::Widget:
-  const ui::NativeTheme* GetNativeTheme() const override;
   bool OnNativeWidgetActivationChanged(bool active) override;
 
   // TODO(jamescook): Introduce a test API instead of these methods.

ash/system/time/time_view.h

@@ -14,7 +14,6 @@
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "components/session_manager/session_manager_types.h"
-#include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/views/view.h"
@@ -49,7 +48,7 @@ class ASH_EXPORT TimeView : public ActionableView, public ClockObserver {
   void UpdateClockLayout(ClockLayout clock_layout);
 
   // Updates the time text color.
-  void SetTextColor(SkColor color, bool auto_color_readability_enabled = true);
+  void SetTextColor(SkColor color, bool auto_color_readability_enabled = false);
 
   // Updates the time text fontlist.
   void SetTextFont(const gfx::FontList& font_list);

ash/system/tray/status_area_overflow_button_tray.cc

@@ -35,7 +35,9 @@ StatusAreaOverflowButtonTray::IconView::IconView()
   layer()->SetFillsBoundsOpaquely(false);
 
   gfx::ImageSkia image = gfx::CreateVectorIcon(
-      kOverflowShelfRightIcon, ShelfConfig::Get()->shelf_icon_color());
+      kOverflowShelfRightIcon,
+      AshColorProvider::Get()->GetContentLayerColor(
+          AshColorProvider::ContentLayerType::kIconColorPrimary));
   SetImage(image);
 
   const int vertical_padding = (kTrayHeight - image.height()) / 2;

ash/system/tray/tray_utils.cc

@@ -20,6 +20,7 @@ void SetupLabelForTray(views::Label* label) {
   // The text is drawn on an transparent bg, so we must disable subpixel
   // rendering.
   label->SetSubpixelRenderingEnabled(false);
+  label->SetAutoColorReadabilityEnabled(false);
   label->SetFontList(gfx::FontList().Derive(
       kTrayTextFontSizeIncrease, gfx::Font::NORMAL, gfx::Font::Weight::MEDIUM));
 }