Commit b4283ffb authored by Tatsuhisa Yamaguchi's avatar Tatsuhisa Yamaguchi Committed by Commit Bot

Use a dedicated do-not-disturb icon for system tray.

We use a different icon on the system tray from the one used in the
notification center window.

Bug: 845804
Change-Id: I08fd9b32385786a7cc468ff4a7c023b950205bec
Reviewed-on: https://chromium-review.googlesource.com/1074582Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Reviewed-by: default avatarYoshiki Iguchi <yoshiki@chromium.org>
Reviewed-by: default avatarTetsui Ohkubo <tetsui@chromium.org>
Commit-Queue: Tatsuhisa Yamaguchi <yamaguchi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563125}
parent e49a36a2
......@@ -166,6 +166,7 @@ aggregate_vector_icons("ash_vector_icons") {
"system_tray_battery_x.icon",
"system_tray_caps_lock.icon",
"system_tray_cast.icon",
"system_tray_do_not_disturb.icon",
"system_tray_night_light.icon",
"system_tray_recording.icon",
"system_tray_rotation_lock_auto.icon",
......
// Copyright 2018 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.
CANVAS_DIMENSIONS, 20,
MOVE_TO, 10, 2,
R_CUBIC_TO, -4.42f, 0, -8, 3.58f, -8, 8,
R_CUBIC_TO, 0, 4.42f, 3.58f, 8, 8, 8,
R_CUBIC_TO, 4.42f, 0, 8, -3.58f, 8, -8,
R_CUBIC_TO, 0, -4.42f, -3.58f, -8, -8, -8,
CLOSE,
R_MOVE_TO, 0, 14,
R_CUBIC_TO, -3.31f, 0, -6, -2.69f, -6, -6,
R_CUBIC_TO, 0, -3.31f, 2.69f, -6, 6, -6,
R_CUBIC_TO, 3.31f, 0, 6, 2.69f, 6, 6,
R_CUBIC_TO, 0, 3.31f, -2.69f, 6, -6, 6,
CLOSE,
MOVE_TO, 7, 9,
R_H_LINE_TO, 6,
R_ARC_TO, 1, 1, 0, 0, 1, 0, 2,
H_LINE_TO, 7,
R_ARC_TO, 1, 1, 0, 1, 1, 0, -2,
CLOSE
\ No newline at end of file
......@@ -33,8 +33,12 @@ void NotificationCounterView::Update() {
QuietModeView::QuietModeView() : TrayItemView(nullptr) {
CreateImageView();
image_view()->SetImage(gfx::CreateVectorIcon(
kNotificationCenterDoNotDisturbOnIcon, kTrayIconSize, kTrayIconColor));
// TODO(yamaguchi): Add this check when new style of the system tray is
// implemented, so that icon resizing will not happen here.
// DCHECK_EQ(kTrayIconSize,
// gfx::GetDefaultSizeOfVectorIcon(kSystemTrayDoNotDisturbIcon));
image_view()->SetImage(gfx::CreateVectorIcon(kSystemTrayDoNotDisturbIcon,
kTrayIconSize, kTrayIconColor));
Update();
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment