Add ink drop ripple to status tray

ash/common/system/tray/system_tray.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/tray/system_tray.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 198 matching lines @@
 
 // SystemTray
 
 SystemTray::SystemTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf),
       web_notification_tray_(nullptr),
       detailed_item_(nullptr),
       default_bubble_height_(0),
       hide_notifications_(false),
       full_system_tray_menu_(false),
+      tray_user_active_(nullptr),
       tray_accessibility_(nullptr),
       tray_audio_(nullptr),
       tray_cast_(nullptr),
       tray_date_(nullptr),
       tray_tiles_(nullptr),
       tray_system_info_(nullptr),
       tray_update_(nullptr),
       screen_capture_tray_item_(nullptr),
       screen_share_tray_item_(nullptr) {
-  SetContentsBackground(true);
+  if (MaterialDesignController::IsShelfMaterial()) {
+    SetInkDropMode(InkDropMode::ON);
+    SetContentsBackground(false);
+  } else {
+    SetContentsBackground(true);
+  }
 }
 
 SystemTray::~SystemTray() {
   // Destroy any child views that might have back pointers before ~View().
   activation_observer_.reset();
   key_event_watcher_.reset();
   system_bubble_.reset();
   notification_bubble_.reset();
   for (std::vector<SystemTrayItem*>::iterator it = items_.begin();
        it != items_.end(); ++it) {
@@ skipping 14 matching lines @@
   DCHECK(web_notification_tray_);
   web_notification_tray_ = nullptr;
 }
 
 void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
 #if !defined(OS_WIN)
   // Create user items for each possible user.
   int maximum_user_profiles = WmShell::Get()
                                   ->GetSessionStateDelegate()
                                   ->GetMaximumNumberOfLoggedInUsers();
-  for (int i = 0; i < maximum_user_profiles; i++)
-    AddTrayItem(new TrayUser(this, i));
+  for (int i = 0; i < maximum_user_profiles; i++) {
+    TrayUser* tray_user = new TrayUser(this, i);
+    if (i == 0)
+      tray_user_active_ = tray_user;
+    AddTrayItem(tray_user);
+  }
 
   // Crucially, this trailing padding has to be inside the user item(s).
   // Otherwise it could be a main axis margin on the tray's box layout.
   if (MaterialDesignController::IsSystemTrayMenuMaterial())
     AddTrayItem(new PaddingTrayItem());
 
   if (maximum_user_profiles > 1) {
     // Add a special double line separator between users and the rest of the
     // menu if more than one user is logged in.
     AddTrayItem(new TrayUserSeparator(this));
@@ skipping 577 matching lines @@
       base::Bind(&SystemTray::ActivateAndStartNavigation,
                  base::Unretained(this)));
 }
 
 void SystemTray::ActivateBubble() {
   TrayBubbleView* bubble_view = GetSystemBubble()->bubble_view();
   bubble_view->set_can_activate(true);
   bubble_view->GetWidget()->Activate();
 }
 
+gfx::Insets SystemTray::GetBackgroundInsets() const {

[bruthig, 2016/11/17 06:31:20]

Double check with Sebastien but I imagine we want the ink drop to be behind the
avatar.  I think you would be able to just make TrayUser::avatar_ paint to it's
own layer.  This would also solve the rounded corners on the ink drop on the
right side too.

[mohsen, 2016/11/17 20:10:12]

Sure. Done.

+  gfx::Insets insets = TrayBackgroundView::GetBackgroundInsets();
+  if (tray_user_active_ && tray_user_active_->is_avatar_visible()) {
+    if (IsHorizontalAlignment(shelf_alignment())) {
+      insets.Set(insets.top(), insets.left(), insets.bottom(),
+                 insets.right() + kTrayItemSize);
+    } else {
+      insets.Set(insets.top(), insets.left(), insets.bottom() + kTrayItemSize,
+                 insets.right());
+    }
+  }
+  return insets;
+}
+
 bool SystemTray::PerformAction(const ui::Event& event) {
   // If we're already showing the default view, hide it; otherwise, show it
   // (and hide any popup that's currently shown).
   if (HasSystemBubbleType(SystemTrayBubble::BUBBLE_TYPE_DEFAULT)) {
     system_bubble_->bubble()->Close();
   } else {
     ShowDefaultView(BUBBLE_CREATE_NEW);
     if (event.IsKeyEvent() || (event.flags() & ui::EF_TOUCH_ACCESSIBILITY))
       ActivateBubble();
   }
@@ skipping 34 matching lines @@
           .work_area()
           .height();
   if (work_area_height > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
         100 * bubble_view->height() / work_area_height, 1, 300, 100);
   }
 }
 
 }  // namespace ash