Change tray transparency and secondary text color

Bug: 1040960
Change-Id: Id84fbea0565c9ff48e89249dfb32dd134125c3ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2029198Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Ahmed Mehfooz <amehfooz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736956}

ash/style/ash_color_provider.cc

@@ -236,7 +236,7 @@ SkColor AshColorProvider::GetContentLayerColorImpl(
       break;
     case ContentLayerType::kTextSecondary:
       light_color = gfx::kGoogleGrey700;
-      dark_color = gfx::kGoogleGrey500;
+      dark_color = gfx::kGoogleGrey400;
       break;
     case ContentLayerType::kIconPrimary:
       light_color = gfx::kGoogleGrey700;

ash/system/unified/unified_system_tray_view.cc

@@ -257,20 +257,14 @@ SkColor UnifiedSystemTrayView::GetBackgroundColor() {
         AshColorProvider::BaseLayerType::kTransparent90,
         kUnifiedMenuBackgroundColor);
   }
-
-  AshColorProvider::BaseLayerType layer_type =
-      (Shell::Get()->tablet_mode_controller() &&
-       Shell::Get()->tablet_mode_controller()->InTabletMode())
-          ? AshColorProvider::BaseLayerType::kTransparent60
-          : AshColorProvider::BaseLayerType::kTransparent74;
-
   auto background_type = Shelf::ForWindow(Shell::GetPrimaryRootWindow())
                              ->shelf_widget()
                              ->GetBackgroundType();
-  if (background_type == ShelfBackgroundType::kMaximized ||
-      background_type == ShelfBackgroundType::kInApp) {
-    layer_type = AshColorProvider::BaseLayerType::kTransparent90;
-  }
+  AshColorProvider::BaseLayerType layer_type =
+      (background_type == ShelfBackgroundType::kMaximized ||
+       background_type == ShelfBackgroundType::kInApp)
+          ? AshColorProvider::BaseLayerType::kTransparent90
+          : AshColorProvider::BaseLayerType::kTransparent74;
 
   SkColor background_color = AshColorProvider::Get()->GetBaseLayerColor(
       layer_type, AshColorProvider::AshColorMode::kDark);