Light theme for login screen.

This CL adds light mode for login shelf buttons, text, icons,
and wallpaper.

Bug: 1110757
Change-Id: I1057aa89bf777f3f35564d7876256f9381059e8c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363799Reviewed-by: Yulun Wu <yulunwu@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Min Chen <minch@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: Thomas Tellier <tellier@google.com>
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803359}

ash/login/ui/login_big_user_view.cc

@@ -6,6 +6,7 @@
 
 #include "ash/public/cpp/login_constants.h"
 #include "ash/shell.h"
+#include "ash/style/ash_color_provider.h"
 #include "ash/wallpaper/wallpaper_controller_impl.h"
 #include "components/account_id/account_id.h"
 #include "ui/views/background.h"
@@ -118,7 +119,7 @@ void LoginBigUserView::OnWallpaperBlurChanged() {
     layer()->SetFillsBoundsOpaquely(false);
     SetBackground(views::CreateBackgroundFromPainter(
         views::Painter::CreateSolidRoundRectPainter(
-            SkColorSetA(login_constants::kDefaultBaseColor,
+            SkColorSetA(AshColorProvider::Get()->GetLoginBackgroundBaseColor(),
                         login_constants::kNonBlurredWallpaperBackgroundAlpha),
             login_constants::kNonBlurredWallpaperBackgroundRadiusDp)));
   }

ash/login/ui/scrollable_users_list_view.cc

@@ -13,6 +13,7 @@
 #include "ash/login/ui/views_utils.h"
 #include "ash/public/cpp/login_constants.h"
 #include "ash/shell.h"
+#include "ash/style/ash_color_provider.h"
 #include "ash/wallpaper/wallpaper_controller_impl.h"
 #include "base/bind.h"
 #include "base/numerics/ranges.h"
@@ -251,7 +252,7 @@ ScrollableUsersListView::GradientParams::BuildForStyle(
               color_utils::ColorProfile(color_utils::LumaRange::DARK,
                                         color_utils::SaturationRange::MUTED));
       SkColor tint_color = color_utils::GetResultingPaintColor(
-          SkColorSetA(login_constants::kDefaultBaseColor,
+          SkColorSetA(AshColorProvider::Get()->GetLoginBackgroundBaseColor(),
                       login_constants::kTranslucentColorDarkenAlpha),
           SkColorSetA(dark_muted_color, SK_AlphaOPAQUE));
       tint_color =
@@ -424,7 +425,7 @@ void ScrollableUsersListView::OnPaintBackground(gfx::Canvas* canvas) {
     flags.setAntiAlias(true);
     flags.setStyle(cc::PaintFlags::kFill_Style);
     flags.setColor(
-        SkColorSetA(login_constants::kDefaultBaseColor,
+        SkColorSetA(AshColorProvider::Get()->GetLoginBackgroundBaseColor(),
                     login_constants::kNonBlurredWallpaperBackgroundAlpha));
     canvas->DrawRoundRect(
         render_bounds, login_constants::kNonBlurredWallpaperBackgroundRadiusDp,

ash/public/cpp/login_constants.h

@@ -18,17 +18,20 @@ namespace login_constants {
 // extracted from wallpaper is invalid.
 constexpr SkColor kDefaultBaseColor = SK_ColorBLACK;
 
+// The light mode base color of the login/lock screen when the color extracted
+// from the wallpaper is invalid.
+constexpr SkColor kLightModeBaseColor = SK_ColorWHITE;
+
 // Color used on text associated with an auth method, e.g., password,
 // fingerprint.
 constexpr SkColor kAuthMethodsTextColor =
     SkColorSetARGB(0xAB, 0xFF, 0xFF, 0xFF);
 
-// When the wallpaper is not blurred, a black background with this alpha should
+// When the wallpaper is not blurred, a background with this alpha should
 // be rendered behind UI elements so they remain legible.
 constexpr int kNonBlurredWallpaperBackgroundAlpha = 0xCC;  // 0xCC -> 80% of 255
 
-// Per above, the black background should be a rounded rect with this corner
-// radius.
+// Per above, the background should be a rounded rect with this corner radius.
 constexpr int kNonBlurredWallpaperBackgroundRadiusDp = 4;
 
 // The alpha value for the login/lock screen background.

ash/shelf/login_shelf_view.cc

@@ -24,6 +24,7 @@
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/style/ash_color_provider.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
@@ -72,6 +73,27 @@ namespace {
 
 const char* kLoginShelfButtonClassName = "LoginShelfButton";
 
+SkColor GetButtonTextColor() {
+  AshColorProvider* ash_color_provider = AshColorProvider::Get();
+  return ash_color_provider->GetContentLayerColor(
+      AshColorProvider::ContentLayerType::kButtonLabelColor,
+      AshColorProvider::AshColorMode::kDark);
+}
+
+SkColor GetButtonIconColor() {
+  AshColorProvider* ash_color_provider = AshColorProvider::Get();
+  return ash_color_provider->GetContentLayerColor(
+      AshColorProvider::ContentLayerType::kButtonIconColor,
+      AshColorProvider::AshColorMode::kDark);
+}
+
+SkColor GetButtonBackgroundColor() {
+  AshColorProvider* ash_color_provider = AshColorProvider::Get();
+  return ash_color_provider->GetControlsLayerColor(
+      AshColorProvider::ControlsLayerType::kControlBackgroundColorInactive,
+      AshColorProvider::AshColorMode::kDark);
+}
+
 LoginMetricsRecorder::ShelfButtonClickTarget GetUserClickTarget(int button_id) {
   switch (button_id) {
     case LoginShelfView::kShutdown:
@@ -106,15 +128,9 @@ constexpr int kButtonMarginRightDp = 16;
 // Spacing between the button image and label.
 constexpr int kImageLabelSpacingDp = 10;
 
-// The color of the button text.
-constexpr SkColor kButtonTextColor = gfx::kGoogleGrey100;
-
 // The color of the button text during OOBE.
 constexpr SkColor kButtonTextColorOobe = gfx::kGoogleGrey700;
 
-// The color of the button icon.
-constexpr SkColor kButtonIconColor = SkColorSetRGB(0xEB, 0xEA, 0xED);
-
 void AnimateButtonOpacity(ui::Layer* layer,
                           float target_opacity,
                           base::TimeDelta animation_duration,
@@ -155,11 +171,12 @@ class LoginShelfButton : public views::LabelButton {
         text_resource_id_(text_resource_id),
         icon_(icon) {
     SetAccessibleName(GetText());
+    SkColor button_icon_color = GetButtonIconColor();
     SetImage(views::Button::STATE_NORMAL,
-             gfx::CreateVectorIcon(icon, kButtonIconColor));
+             gfx::CreateVectorIcon(icon, button_icon_color));
     SetImage(views::Button::STATE_DISABLED,
              gfx::CreateVectorIcon(
-                 icon, SkColorSetA(kButtonIconColor,
+                 icon, SkColorSetA(button_icon_color,
                                    login_constants::kButtonDisabledAlpha)));
     SetFocusBehavior(FocusBehavior::ALWAYS);
     SetInstallFocusRingOnFocus(true);
@@ -181,10 +198,12 @@ class LoginShelfButton : public views::LabelButton {
     SetTextSubpixelRenderingEnabled(false);
 
     SetImageLabelSpacing(kImageLabelSpacingDp);
-    SetEnabledTextColors(kButtonTextColor);
+
+    SkColor button_text_color = GetButtonTextColor();
+    SetEnabledTextColors(button_text_color);
     SetTextColor(
         views::Button::STATE_DISABLED,
-        SkColorSetA(kButtonTextColor, login_constants::kButtonDisabledAlpha));
+        SkColorSetA(button_text_color, login_constants::kButtonDisabledAlpha));
     label()->SetFontList(views::Label::GetDefaultFontList().Derive(
         1, gfx::Font::FontStyle::NORMAL, gfx::Font::Weight::NORMAL));
   }
@@ -205,7 +224,7 @@ class LoginShelfButton : public views::LabelButton {
   void PaintButtonContents(gfx::Canvas* canvas) override {
     cc::PaintFlags flags;
     flags.setAntiAlias(true);
-    flags.setColor(ShelfConfig::Get()->GetShelfControlButtonColor());
+    flags.setColor(GetButtonBackgroundColor());
     flags.setStyle(cc::PaintFlags::kFill_Style);
     canvas->DrawPath(GetButtonHighlightPath(this), flags);
   }
@@ -231,9 +250,10 @@ class LoginShelfButton : public views::LabelButton {
   }
 
   void PaintLightColors() {
-    SetEnabledTextColors(kButtonTextColor);
+    SkColor button_text_color = GetButtonTextColor();
+    SetEnabledTextColors(button_text_color);
     SetImage(views::Button::STATE_NORMAL,
-             gfx::CreateVectorIcon(icon_, kButtonTextColor));
+             gfx::CreateVectorIcon(icon_, button_text_color));
     SchedulePaint();
   }
 
@@ -293,9 +313,9 @@ class KioskAppsButton : public views::MenuButton,
     SetTextSubpixelRenderingEnabled(false);
 
     SetImage(views::Button::STATE_NORMAL,
-             CreateVectorIcon(kShelfAppsButtonIcon, kButtonIconColor));
+             CreateVectorIcon(kShelfAppsButtonIcon, GetButtonIconColor()));
     SetImageLabelSpacing(kImageLabelSpacingDp);
-    SetEnabledTextColors(kButtonTextColor);
+    SetEnabledTextColors(GetButtonTextColor());
     label()->SetFontList(views::Label::GetDefaultFontList().Derive(
         1, gfx::Font::FontStyle::NORMAL, gfx::Font::Weight::NORMAL));
   }
@@ -371,9 +391,9 @@ class KioskAppsButton : public views::MenuButton,
   }
 
   void PaintLightColors() {
-    SetEnabledTextColors(kButtonTextColor);
+    SetEnabledTextColors(GetButtonTextColor());
     SetImage(views::Button::STATE_NORMAL,
-             CreateVectorIcon(kShelfAppsButtonIcon, kButtonIconColor));
+             CreateVectorIcon(kShelfAppsButtonIcon, GetButtonIconColor()));
     SchedulePaint();
   }
 

ash/shelf/shelf_background_animator.cc

@@ -15,6 +15,7 @@
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_background_animator_observer.h"
 #include "ash/shell.h"
+#include "ash/style/ash_color_provider.h"
 #include "ash/wallpaper/wallpaper_controller_impl.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "chromeos/constants/chromeos_switches.h"
@@ -242,7 +243,7 @@ SkColor ShelfBackgroundAnimator::GetBackgroundColor(
       break;
     case ShelfBackgroundType::kLoginNonBlurredWallpaper:
       shelf_target_color =
-          SkColorSetA(login_constants::kDefaultBaseColor,
+          SkColorSetA(AshColorProvider::Get()->GetLoginBackgroundBaseColor(),
                       login_constants::kNonBlurredWallpaperBackgroundAlpha);
       break;
   }

ash/style/ash_color_provider.cc

@@ -8,6 +8,7 @@
 
 #include "ash/public/cpp/ash_constants.h"
 #include "ash/public/cpp/ash_pref_names.h"
+#include "ash/public/cpp/login_constants.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/system/dark_mode/color_mode_observer.h"
@@ -116,6 +117,11 @@ void AshColorProvider::OnActiveUserPrefServiceChanged(PrefService* prefs) {
   NotifyDarkModeEnabledPrefChange();
 }
 
+SkColor AshColorProvider::GetLoginBackgroundBaseColor() const {
+  return IsDarkModeEnabled() ? login_constants::kDefaultBaseColor
+                             : login_constants::kLightModeBaseColor;
+}
+
 SkColor AshColorProvider::DeprecatedGetShieldLayerColor(
     ShieldLayerType type,
     SkColor default_color) const {

ash/style/ash_color_provider.h

@@ -236,6 +236,9 @@ class ASH_EXPORT AshColorProvider : public SessionObserver {
   // Toggles pref |kDarkModeEnabled|.
   void Toggle();
 
+  // Gets the background base color for login screen.
+  SkColor GetLoginBackgroundBaseColor() const;
+
   bool is_themed() const { return is_themed_; }
 
  private:

ash/wallpaper/wallpaper_base_view.cc

@@ -7,6 +7,7 @@
 #include "ash/public/cpp/login_constants.h"
 #include "ash/public/cpp/wallpaper_types.h"
 #include "ash/shell.h"
+#include "ash/style/ash_color_provider.h"
 #include "ash/wallpaper/wallpaper_controller_impl.h"
 #include "ash/wm/overview/overview_controller.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
@@ -29,11 +30,12 @@ SkColor GetWallpaperDarkenColor() {
       Shell::Get()->wallpaper_controller()->GetProminentColor(
           color_utils::ColorProfile(color_utils::LumaRange::DARK,
                                     color_utils::SaturationRange::MUTED));
-  if (darken_color == kInvalidWallpaperColor)
-    darken_color = login_constants::kDefaultBaseColor;
+  if (darken_color == kInvalidWallpaperColor) {
+    darken_color = AshColorProvider::Get()->GetLoginBackgroundBaseColor();
+  }
 
   darken_color = color_utils::GetResultingPaintColor(
-      SkColorSetA(login_constants::kDefaultBaseColor,
+      SkColorSetA(AshColorProvider::Get()->GetLoginBackgroundBaseColor(),
                   login_constants::kTranslucentColorDarkenAlpha),
       SkColorSetA(darken_color, 0xFF));