Restore classic page switcher colors.

This CL addresses changes in:

https://chromium-review.googlesource.com/c/chromium/src/+/2416763

Bug: 1134800
Change-Id: Id31abaf88693fc6bdfd834033800e80eb6fb1f4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2462622Reviewed-by: Yulun Wu <yulunwu@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815830}

ash/app_list/app_list_color_provider_impl.cc

@@ -15,8 +15,7 @@ AppListColorProviderImpl::AppListColorProviderImpl()
 AppListColorProviderImpl::~AppListColorProviderImpl() = default;
 
 SkColor AppListColorProviderImpl::GetExpandArrowInkDropBaseColor() const {
-  return DeprecatedGetShelfInkDropBaseColor(
-      SkColorSetARGB(0x14, 0xFF, 0xFF, 0xFF));
+  return DeprecatedGetInkDropBaseColor(SkColorSetARGB(0x14, 0xFF, 0xFF, 0xFF));
 }
 
 SkColor AppListColorProviderImpl::GetExpandArrowIconBaseColor() const {
@@ -81,23 +80,28 @@ SkColor AppListColorProviderImpl::GetAppListItemTextColor() const {
       AshColorProvider::ContentLayerType::kTextColorPrimary, SK_ColorBLACK);
 }
 
-SkColor AppListColorProviderImpl::GetPageSwitcherButtonColor() const {
-  return ash_color_provider_->GetContentLayerColor(
-      AshColorProvider::ContentLayerType::kButtonIconColor);
+SkColor AppListColorProviderImpl::GetPageSwitcherButtonColor(
+    bool is_root_app_grid_page_switcher) const {
+  return DeprecatedGetContentLayerColor(
+      AshColorProvider::ContentLayerType::kButtonIconColor,
+      is_root_app_grid_page_switcher ? SkColorSetARGB(255, 232, 234, 237)
+                                     : SkColorSetARGB(255, 232, 234, 237));
 }
 
-SkColor AppListColorProviderImpl::GetPageSwitcherInkDropBaseColor() const {
-  AshColorProvider::RippleAttributes ripple_attributes =
-      ash_color_provider_->GetRippleAttributes(GetAppListBackgroundColor());
-  return SkColorSetA(ripple_attributes.base_color,
-                     ripple_attributes.inkdrop_opacity * 255);
+SkColor AppListColorProviderImpl::GetPageSwitcherInkDropBaseColor(
+    bool is_root_app_grid_page_switcher) const {
+  return DeprecatedGetInkDropRippleColor(
+      is_root_app_grid_page_switcher
+          ? SkColorSetA(SkColorSetRGB(241, 243, 244), 15)
+          : SkColorSetA(SkColorSetRGB(241, 243, 244), 8));
 }
 
-SkColor AppListColorProviderImpl::GetPageSwitcherInkDropHighlightColor() const {
-  AshColorProvider::RippleAttributes ripple_attributes =
-      ash_color_provider_->GetRippleAttributes(GetAppListBackgroundColor());
-  return SkColorSetA(ripple_attributes.base_color,
-                     ripple_attributes.highlight_opacity * 255);
+SkColor AppListColorProviderImpl::GetPageSwitcherInkDropHighlightColor(
+    bool is_root_app_grid_page_switcher) const {
+  return DeprecatedGetInkDropHighlightColor(
+      is_root_app_grid_page_switcher
+          ? SkColorSetA(SkColorSetARGB(255, 95, 99, 104), 20)
+          : SkColorSetA(SkColorSetARGB(255, 95, 99, 104), 24));
 }
 
 SkColor AppListColorProviderImpl::GetSearchBoxIconColor(

ash/app_list/app_list_color_provider_impl.h

@@ -27,9 +27,12 @@ class AppListColorProviderImpl : public AppListColorProvider {
   SkColor GetSuggestionChipBackgroundColor() const override;
   SkColor GetSuggestionChipTextColor() const override;
   SkColor GetAppListItemTextColor() const override;
-  SkColor GetPageSwitcherButtonColor() const override;
-  SkColor GetPageSwitcherInkDropBaseColor() const override;
-  SkColor GetPageSwitcherInkDropHighlightColor() const override;
+  SkColor GetPageSwitcherButtonColor(
+      bool is_root_app_grid_page_switcher) const override;
+  SkColor GetPageSwitcherInkDropBaseColor(
+      bool is_root_app_grid_page_switcher) const override;
+  SkColor GetPageSwitcherInkDropHighlightColor(
+      bool is_root_app_grid_page_switcher) const override;
   SkColor GetSearchBoxIconColor(SkColor default_color) const override;
   SkColor GetSearchBoxCardBackgroundColor() const override;
   SkColor GetFolderBackgroundColor(SkColor default_color) const override;

ash/app_list/test/test_app_list_color_provider.cc

@@ -61,15 +61,18 @@ SkColor TestAppListColorProvider::GetFolderBackgroundColor(
   return gfx::kGoogleGrey900;
 }
 
-SkColor TestAppListColorProvider::GetPageSwitcherButtonColor() const {
+SkColor TestAppListColorProvider::GetPageSwitcherButtonColor(
+    bool is_root_app_grid_page_switcher) const {
   return gfx::kGoogleGrey700;
 }
 
-SkColor TestAppListColorProvider::GetPageSwitcherInkDropBaseColor() const {
+SkColor TestAppListColorProvider::GetPageSwitcherInkDropBaseColor(
+    bool is_root_app_grid_page_switcher) const {
   return SkColorSetA(SK_ColorBLACK, 0x0F);
 }
 
-SkColor TestAppListColorProvider::GetPageSwitcherInkDropHighlightColor() const {
+SkColor TestAppListColorProvider::GetPageSwitcherInkDropHighlightColor(
+    bool is_root_app_grid_page_switcher) const {
   return SkColorSetA(SK_ColorBLACK, 0x0F);
 }
 

ash/app_list/test/test_app_list_color_provider.h

@@ -27,9 +27,12 @@ class TestAppListColorProvider : public AppListColorProvider {
   SkColor GetSuggestionChipBackgroundColor() const override;
   SkColor GetSuggestionChipTextColor() const override;
   SkColor GetAppListItemTextColor() const override;
-  SkColor GetPageSwitcherButtonColor() const override;
-  SkColor GetPageSwitcherInkDropBaseColor() const override;
-  SkColor GetPageSwitcherInkDropHighlightColor() const override;
+  SkColor GetPageSwitcherButtonColor(
+      bool is_root_app_grid_page_switcher) const override;
+  SkColor GetPageSwitcherInkDropBaseColor(
+      bool is_root_app_grid_page_switcher) const override;
+  SkColor GetPageSwitcherInkDropHighlightColor(
+      bool is_root_app_grid_page_switcher) const override;
   SkColor GetSearchBoxIconColor(SkColor default_color) const override;
   SkColor GetSearchBoxCardBackgroundColor() const override;
   SkColor GetFolderBackgroundColor(SkColor default_color) const override;

ash/app_list/views/page_switcher.cc

@@ -102,14 +102,17 @@ class PageSwitcherButton : public views::Button {
     return std::make_unique<views::FloodFillInkDropRipple>(
         size(), GetLocalBounds().InsetsFrom(bounds),
         GetInkDropCenterBasedOnLastEvent(),
-        AppListColorProvider::Get()->GetPageSwitcherInkDropBaseColor(), 1.0f);
+        AppListColorProvider::Get()->GetPageSwitcherInkDropBaseColor(
+            is_root_app_grid_page_switcher_),
+        1.0f);
   }
 
   std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
       const override {
     auto highlight = std::make_unique<views::InkDropHighlight>(
         gfx::SizeF(size()),
-        AppListColorProvider::Get()->GetPageSwitcherInkDropHighlightColor());
+        AppListColorProvider::Get()->GetPageSwitcherInkDropHighlightColor(
+            is_root_app_grid_page_switcher_));
     highlight->set_visible_opacity(1.f);
     return highlight;
   }
@@ -131,7 +134,8 @@ class PageSwitcherButton : public views::Button {
   // Returns the information of how to paint selected/normal button.
   PaintButtonInfo BuildPaintButtonInfo() {
     PaintButtonInfo info;
-    info.color = AppListColorProvider::Get()->GetPageSwitcherButtonColor();
+    info.color = AppListColorProvider::Get()->GetPageSwitcherButtonColor(
+        is_root_app_grid_page_switcher_);
     if (selected_) {
       info.style = cc::PaintFlags::kFill_Style;
       info.radius = SkIntToScalar(kSelectedButtonRadius);

ash/public/cpp/app_list/app_list_color_provider.h

@@ -26,9 +26,12 @@ class ASH_PUBLIC_EXPORT AppListColorProvider {
   virtual SkColor GetSuggestionChipBackgroundColor() const = 0;
   virtual SkColor GetSuggestionChipTextColor() const = 0;
   virtual SkColor GetAppListItemTextColor() const = 0;
-  virtual SkColor GetPageSwitcherButtonColor() const = 0;
-  virtual SkColor GetPageSwitcherInkDropBaseColor() const = 0;
-  virtual SkColor GetPageSwitcherInkDropHighlightColor() const = 0;
+  virtual SkColor GetPageSwitcherButtonColor(
+      bool is_root_app_grid_page_switcher) const = 0;
+  virtual SkColor GetPageSwitcherInkDropBaseColor(
+      bool is_root_app_grid_page_switcher) const = 0;
+  virtual SkColor GetPageSwitcherInkDropHighlightColor(
+      bool is_root_app_grid_page_switcher) const = 0;
   virtual SkColor GetSearchBoxIconColor(SkColor default_color) const = 0;
   virtual SkColor GetSearchBoxCardBackgroundColor() const = 0;
   virtual SkColor GetFolderBackgroundColor(SkColor default_color) const = 0;

ash/shelf/login_shelf_view.cc

@@ -189,9 +189,9 @@ class LoginShelfButton : public views::LabelButton {
     SetInkDropMode(InkDropMode::ON);
     SetHasInkDropActionOnClick(true);
     SetInkDropBaseColor(
-        DeprecatedGetShelfInkDropBaseColor(kDefaultShelfInkDropColor));
+        DeprecatedGetInkDropBaseColor(kDefaultShelfInkDropColor));
     SetInkDropVisibleOpacity(
-        DeprecatedGetShelfInkDropOpacity(kDefaultShelfInkDropOpacity));
+        DeprecatedGetInkDropOpacity(kDefaultShelfInkDropOpacity));
 
     // Layer rendering is required when the shelf background is visible, which
     // happens when the wallpaper is not blurred.
@@ -305,9 +305,9 @@ class KioskAppsButton : public views::MenuButton,
     SetInkDropMode(InkDropMode::ON);
     SetHasInkDropActionOnClick(true);
     SetInkDropBaseColor(
-        DeprecatedGetShelfInkDropBaseColor(kDefaultShelfInkDropColor));
+        DeprecatedGetInkDropBaseColor(kDefaultShelfInkDropColor));
     SetInkDropVisibleOpacity(
-        DeprecatedGetShelfInkDropOpacity(kDefaultShelfInkDropOpacity));
+        DeprecatedGetInkDropOpacity(kDefaultShelfInkDropOpacity));
 
     // Layer rendering is required when the shelf background is visible, which
     // happens when the wallpaper is not blurred.

ash/shelf/shelf_button.cc

@@ -23,10 +23,9 @@ ShelfButton::ShelfButton(Shelf* shelf,
       shelf_button_delegate_(shelf_button_delegate) {
   DCHECK(shelf_button_delegate_);
   SetHideInkDropWhenShowingContextMenu(false);
-  SetInkDropBaseColor(
-      DeprecatedGetShelfInkDropBaseColor(kDefaultShelfInkDropColor));
+  SetInkDropBaseColor(DeprecatedGetInkDropBaseColor(kDefaultShelfInkDropColor));
   SetInkDropVisibleOpacity(
-      DeprecatedGetShelfInkDropOpacity(kDefaultShelfInkDropOpacity));
+      DeprecatedGetInkDropOpacity(kDefaultShelfInkDropOpacity));
   SetFocusBehavior(FocusBehavior::ALWAYS);
   SetInkDropMode(InkDropMode::ON_NO_GESTURE_HANDLER);
   SetFocusPainter(views::Painter::CreateSolidFocusPainter(

ash/style/default_colors.cc

@@ -47,14 +47,38 @@ SkColor DeprecatedGetLoginBackgroundBaseColor(SkColor default_color) {
   return AshColorProvider::Get()->GetLoginBackgroundBaseColor();
 }
 
-SkColor DeprecatedGetShelfInkDropBaseColor(SkColor default_color) {
+SkColor DeprecatedGetInkDropBaseColor(SkColor default_color) {
   if (!features::IsDarkLightModeEnabled())
     return default_color;
 
   return AshColorProvider::Get()->GetRippleAttributes().base_color;
 }
 
-float DeprecatedGetShelfInkDropOpacity(float default_opacity) {
+SkColor DeprecatedGetInkDropRippleColor(SkColor default_color) {
+  if (!features::IsDarkLightModeEnabled())
+    return default_color;
+
+  AshColorProvider::RippleAttributes ripple_attributes =
+      AshColorProvider::Get()->GetRippleAttributes(
+          AshColorProvider::Get()->GetShieldLayerColor(
+              AshColorProvider::ShieldLayerType::kShield80));
+  return SkColorSetA(ripple_attributes.base_color,
+                     ripple_attributes.inkdrop_opacity * 255);
+}
+
+SkColor DeprecatedGetInkDropHighlightColor(SkColor default_color) {
+  if (!features::IsDarkLightModeEnabled())
+    return default_color;
+
+  AshColorProvider::RippleAttributes ripple_attributes =
+      AshColorProvider::Get()->GetRippleAttributes(
+          AshColorProvider::Get()->GetShieldLayerColor(
+              AshColorProvider::ShieldLayerType::kShield80));
+  return SkColorSetA(ripple_attributes.base_color,
+                     ripple_attributes.inkdrop_opacity * 255);
+}
+
+float DeprecatedGetInkDropOpacity(float default_opacity) {
   if (!features::IsDarkLightModeEnabled())
     return default_opacity;
 

ash/style/default_colors.h

@@ -25,8 +25,10 @@ SkColor DeprecatedGetControlsLayerColor(
 SkColor DeprecatedGetContentLayerColor(AshColorProvider::ContentLayerType type,
                                        SkColor default_color);
 SkColor DeprecatedGetLoginBackgroundBaseColor(SkColor default_color);
-SkColor DeprecatedGetShelfInkDropBaseColor(SkColor default_color);
-float DeprecatedGetShelfInkDropOpacity(float default_opacity);
+SkColor DeprecatedGetInkDropBaseColor(SkColor default_color);
+SkColor DeprecatedGetInkDropRippleColor(SkColor default_color);
+SkColor DeprecatedGetInkDropHighlightColor(SkColor default_color);
+float DeprecatedGetInkDropOpacity(float default_opacity);
 SkColor DeprecatedGetAppStateIndicatorColor(bool active,
                                             SkColor active_color,
                                             SkColor default_color);

ash/system/tray/tray_background_view.cc

@@ -162,10 +162,9 @@ TrayBackgroundView::TrayBackgroundView(Shelf* shelf)
   DCHECK(shelf_);
   SetNotifyEnterExitOnChild(true);
 
-  SetInkDropBaseColor(
-      DeprecatedGetShelfInkDropBaseColor(kDefaultShelfInkDropColor));
+  SetInkDropBaseColor(DeprecatedGetInkDropBaseColor(kDefaultShelfInkDropColor));
   SetInkDropVisibleOpacity(
-      DeprecatedGetShelfInkDropOpacity(kDefaultShelfInkDropOpacity));
+      DeprecatedGetInkDropOpacity(kDefaultShelfInkDropOpacity));
 
   SetInkDropMode(InkDropMode::ON_NO_GESTURE_HANDLER);
   SetLayoutManager(std::make_unique<views::FillLayout>());