Update login shelf icons and coloring for light/dark mode.

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

ash/login/ui/login_big_user_view.cc

@@ -120,9 +120,8 @@ void LoginBigUserView::OnWallpaperBlurChanged() {
     layer()->SetFillsBoundsOpaquely(false);
     SetBackground(views::CreateBackgroundFromPainter(
         views::Painter::CreateSolidRoundRectPainter(
-            SkColorSetA(DeprecatedGetLoginBackgroundBaseColor(
-                            kLoginBackgroundBaseColor),
-                        login_constants::kNonBlurredWallpaperBackgroundAlpha),
+            AshColorProvider::Get()->GetShieldLayerColor(
+                AshColorProvider::ShieldLayerType::kShield80),
             login_constants::kNonBlurredWallpaperBackgroundRadiusDp)));
   }
 }

ash/login/ui/scrollable_users_list_view.cc

@@ -254,12 +254,9 @@ ScrollableUsersListView::GradientParams::BuildForStyle(
               color_utils::ColorProfile(color_utils::LumaRange::DARK,
                                         color_utils::SaturationRange::MUTED));
       SkColor tint_color = color_utils::GetResultingPaintColor(
-          SkColorSetA(
-              DeprecatedGetLoginBackgroundBaseColor(kLoginBackgroundBaseColor),
-              login_constants::kTranslucentColorDarkenAlpha),
+          AshColorProvider::Get()->GetShieldLayerColor(
+              AshColorProvider::ShieldLayerType::kShield80),
           SkColorSetA(dark_muted_color, SK_AlphaOPAQUE));
-      tint_color =
-          SkColorSetA(tint_color, login_constants::kScrollTranslucentAlpha);
 
       GradientParams params;
       params.color_from = dark_muted_color;
@@ -427,9 +424,8 @@ void ScrollableUsersListView::OnPaintBackground(gfx::Canvas* canvas) {
     cc::PaintFlags flags;
     flags.setAntiAlias(true);
     flags.setStyle(cc::PaintFlags::kFill_Style);
-    flags.setColor(SkColorSetA(
-        DeprecatedGetLoginBackgroundBaseColor(kLoginBackgroundBaseColor),
-        login_constants::kNonBlurredWallpaperBackgroundAlpha));
+    flags.setColor(AshColorProvider::Get()->GetShieldLayerColor(
+        AshColorProvider::ShieldLayerType::kShield80));
     canvas->DrawRoundRect(
         render_bounds, login_constants::kNonBlurredWallpaperBackgroundRadiusDp,
         flags);

ash/shelf/login_shelf_view.cc

@@ -94,7 +94,8 @@ SkColor GetButtonBackgroundColor() {
       session_manager::SessionState::OOBE) {
     return SkColorSetA(SK_ColorBLACK, 16);  // 6% opacity
   }
-  return DeprecatedGetLoginBackgroundBaseColor(kLoginButtonBackgroundBaseColor);
+  return AshColorProvider::Get()->GetControlsLayerColor(
+      AshColorProvider::ControlsLayerType::kControlBackgroundColorInactive);
 }
 
 LoginMetricsRecorder::ShelfButtonClickTarget GetUserClickTarget(int button_id) {
@@ -180,13 +181,8 @@ 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, button_icon_color));
-    SetImage(views::Button::STATE_DISABLED,
-             gfx::CreateVectorIcon(
-                 icon, SkColorSetA(button_icon_color,
-                                   login_constants::kButtonDisabledAlpha)));
+    AshColorProvider::Get()->DecoratePillButton(this, &icon);
+
     SetFocusBehavior(FocusBehavior::ALWAYS);
     SetInstallFocusRingOnFocus(true);
     views::InstallRoundRectHighlightPathGenerator(
@@ -209,11 +205,6 @@ class LoginShelfButton : public views::LabelButton {
 
     SetImageLabelSpacing(kImageLabelSpacingDp);
 
-    SkColor button_text_color = GetButtonTextColor();
-    SetEnabledTextColors(button_text_color);
-    SetTextColor(
-        views::Button::STATE_DISABLED,
-        SkColorSetA(button_text_color, login_constants::kButtonDisabledAlpha));
     label()->SetFontList(views::Label::GetDefaultFontList().Derive(
         1, gfx::Font::FontStyle::NORMAL, gfx::Font::Weight::NORMAL));
   }

ash/shelf/shelf_background_animator.cc

@@ -241,9 +241,8 @@ SkColor ShelfBackgroundAnimator::GetBackgroundColor(
       shelf_target_color = SK_ColorTRANSPARENT;
       break;
     case ShelfBackgroundType::kLoginNonBlurredWallpaper:
-      shelf_target_color = SkColorSetA(
-          DeprecatedGetLoginBackgroundBaseColor(kLoginBackgroundBaseColor),
-          login_constants::kNonBlurredWallpaperBackgroundAlpha);
+      shelf_target_color = AshColorProvider::Get()->GetShieldLayerColor(
+          AshColorProvider::ShieldLayerType::kShield80);
       break;
   }
   return shelf_target_color;

ash/style/ash_color_provider.cc

@@ -9,7 +9,6 @@
 #include "ash/public/cpp/ash_constants.h"
 #include "ash/public/cpp/ash_features.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"
@@ -391,11 +390,6 @@ void AshColorProvider::UpdateColorModeThemed(bool is_themed) {
   AttemptRestartChrome();
 }
 
-SkColor AshColorProvider::GetLoginBackgroundBaseColor() const {
-  return IsDarkModeEnabled() ? login_constants::kDefaultBaseColor
-                             : login_constants::kLightModeBaseColor;
-}
-
 SkColor AshColorProvider::GetBackgroundDefaultColor() const {
   return IsDarkModeEnabled() ? kBackgroundColorDefaultDark
                              : kBackgroundColorDefaultLight;

ash/style/ash_color_provider.h

@@ -210,9 +210,6 @@ class ASH_EXPORT AshColorProvider : public SessionObserver {
   // Updates pref |kColorModeThemed| to |is_themed|.
   void UpdateColorModeThemed(bool is_themed);
 
-  // Gets the background base color for login screen.
-  SkColor GetLoginBackgroundBaseColor() const;
-
  private:
   friend class ScopedLightModeAsDefault;
 

ash/style/default_colors.cc

@@ -48,12 +48,6 @@ SkColor DeprecatedGetContentLayerColor(AshColorProvider::ContentLayerType type,
   return AshColorProvider::Get()->GetContentLayerColor(type);
 }
 
-SkColor DeprecatedGetLoginBackgroundBaseColor(SkColor default_color) {
-  if (!features::IsDarkLightModeEnabled())
-    return default_color;
-  return AshColorProvider::Get()->GetLoginBackgroundBaseColor();
-}
-
 SkColor DeprecatedGetInkDropBaseColor(SkColor default_color) {
   if (!features::IsDarkLightModeEnabled())
     return default_color;

ash/style/default_colors.h

@@ -25,7 +25,6 @@ SkColor DeprecatedGetControlsLayerColor(
     SkColor default_color);
 SkColor DeprecatedGetContentLayerColor(AshColorProvider::ContentLayerType type,
                                        SkColor default_color);
-SkColor DeprecatedGetLoginBackgroundBaseColor(SkColor default_color);
 SkColor DeprecatedGetInkDropBaseColor(SkColor default_color);
 SkColor DeprecatedGetInkDropRippleColor(SkColor default_color);
 SkColor DeprecatedGetInkDropHighlightColor(SkColor default_color);

ash/wallpaper/wallpaper_base_view.cc

@@ -22,38 +22,11 @@ namespace ash {
 
 namespace {
 
-// The value used for alpha to apply a color filter to the wallpaper in tablet
-// mode. A higher number up to 255 results the color filter being more
-// prominent.
-constexpr int kTabletModeWallpaperAlpha = 102;
-
-// Gets the color filter based on the state. This is used for the login, lock,
-// overview and tablet mode.
 SkColor GetWallpaperFilterColor() {
-  if (Shell::Get()->overview_controller()->InOverviewSession()) {
-    return AshColorProvider::Get()->GetShieldLayerColor(
-        AshColorProvider::ShieldLayerType::kShield40);
-  }
-
-  SkColor darken_color =
-      Shell::Get()->wallpaper_controller()->GetProminentColor(
-          color_utils::ColorProfile(color_utils::LumaRange::DARK,
-                                    color_utils::SaturationRange::MUTED));
-  if (darken_color == kInvalidWallpaperColor) {
-    darken_color =
-        DeprecatedGetLoginBackgroundBaseColor(kLoginBackgroundBaseColor);
-  }
-
-  darken_color = color_utils::GetResultingPaintColor(
-      SkColorSetA(
-          DeprecatedGetLoginBackgroundBaseColor(kLoginBackgroundBaseColor),
-          login_constants::kTranslucentColorDarkenAlpha),
-      SkColorSetA(darken_color, 0xFF));
-
-  const int alpha = Shell::Get()->tablet_mode_controller()->InTabletMode()
-                        ? kTabletModeWallpaperAlpha
-                        : login_constants::kTranslucentAlpha;
-  return SkColorSetA(darken_color, alpha);
+  return AshColorProvider::Get()->GetShieldLayerColor(
+      Shell::Get()->overview_controller()->InOverviewSession()
+          ? AshColorProvider::ShieldLayerType::kShield40
+          : AshColorProvider::ShieldLayerType::kShield80);
 }
 
 }  // namespace