Commit 4d1dec77 authored by Tetsui Ohkubo's avatar Tetsui Ohkubo Committed by Commit Bot

Replace icons of UnifiedSystemTray main view.

This CL replaces main view icons of UnifiedSystemTray by new ones.
Network icon is not included as it requires special handling.
Detailed view icons will be also updated in upcoming CLs.

Screenshot: http://screen/Kb8w2tQxdkP

TEST=manual
BUG=842079

Change-Id: Icd7454d8b26b642c58a0b014b7d6081069d38e7d
Reviewed-on: https://chromium-review.googlesource.com/1118080Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Reviewed-by: default avatarYoshiki Iguchi <yoshiki@chromium.org>
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572062}
parent bc68bebf
...@@ -185,6 +185,29 @@ aggregate_vector_icons("ash_vector_icons") { ...@@ -185,6 +185,29 @@ aggregate_vector_icons("ash_vector_icons") {
"touch_calibration_complete_check.icon", "touch_calibration_complete_check.icon",
"touch_calibration_hand.icon", "touch_calibration_hand.icon",
"tray_action_new_lock_screen_note.icon", "tray_action_new_lock_screen_note.icon",
"unified_menu_accessibility.icon",
"unified_menu_bluetooth_connected.icon",
"unified_menu_bluetooth.icon",
"unified_menu_brightness.icon",
"unified_menu_cast.icon",
"unified_menu_do_not_disturb.icon",
"unified_menu_expand.icon",
"unified_menu_keyboard_brightness.icon",
"unified_menu_keyboard.icon",
"unified_menu_lock.icon",
"unified_menu_managed.icon",
"unified_menu_more.icon",
"unified_menu_night_light.icon",
"unified_menu_power.icon",
"unified_menu_rotation_lock_auto.icon",
"unified_menu_rotation_lock_landscape.icon",
"unified_menu_rotation_lock_portrait.icon",
"unified_menu_settings.icon",
"unified_menu_volume_high.icon",
"unified_menu_volume_low.icon",
"unified_menu_volume_medium.icon",
"unified_menu_volume_mute.icon",
"unified_menu_vpn.icon",
"window_control_back.icon", "window_control_back.icon",
"window_control_dezoom.icon", "window_control_dezoom.icon",
"window_control_menu.icon", "window_control_menu.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, 24,
MOVE_TO, 12, 2,
R_CUBIC_TO, 1.1f, 0, 2, 0.9f, 2, 2,
R_CUBIC_TO, 0, 1.1f, -0.9f, 2, -2, 2,
R_CUBIC_TO, -1.1f, 0, -2, -0.9f, -2, -2,
R_CUBIC_TO, 0, -1.1f, 0.9f, -2, 2, -2,
CLOSE,
R_MOVE_TO, 8, 7,
R_H_LINE_TO, -5,
R_V_LINE_TO, 12,
R_CUBIC_TO, 0, 0.55f, -0.45f, 1, -1, 1,
R_CUBIC_TO, -0.55f, 0, -1, -0.45f, -1, -1,
R_V_LINE_TO, -5,
R_H_LINE_TO, -2,
R_V_LINE_TO, 5,
R_CUBIC_TO, 0, 0.55f, -0.45f, 1, -1, 1,
R_CUBIC_TO, -0.55f, 0, -1, -0.45f, -1, -1,
V_LINE_TO, 9,
H_LINE_TO, 4,
R_CUBIC_TO, -0.55f, 0, -1, -0.45f, -1, -1,
R_CUBIC_TO, 0, -0.55f, 0.45f, -1, 1, -1,
R_H_LINE_TO, 16,
R_CUBIC_TO, 0.55f, 0, 1, 0.45f, 1, 1,
R_CUBIC_TO, 0, 0.55f, -0.45f, 1, -1, 1,
CLOSE
// 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, 24,
MOVE_TO, 13.57f, 18.62f,
R_V_LINE_TO, -4.3f,
R_LINE_TO, 2.08f, 2.15f,
R_LINE_TO, -2.08f, 2.15f,
CLOSE,
R_MOVE_TO, 0, -8.95f,
R_V_LINE_TO, -4.3f,
R_LINE_TO, 2.08f, 2.15f,
R_LINE_TO, -2.08f, 2.15f,
CLOSE,
R_MOVE_TO, 0.5f, 2.33f,
R_LINE_TO, 3.63f, -3.74f,
R_CUBIC_TO, 0.4f, -0.41f, 0.4f, -1.07f, 0, -1.48f,
R_LINE_TO, -4.33f, -4.47f,
R_LINE_TO, -0.03f, -0.03f,
R_CUBIC_TO, -0.41f, -0.39f, -1.05f, -0.37f, -1.43f, 0.05f,
R_CUBIC_TO, -0.17f, 0.19f, -0.27f, 0.45f, -0.27f, 0.71f,
R_V_LINE_TO, 6.44f,
R_LINE_TO, -3.92f, -4.05f,
R_CUBIC_TO, -0.4f, -0.41f, -1.03f, -0.41f, -1.42f, 0,
R_CUBIC_TO, -0.4f, 0.41f, -0.4f, 1.06f, 0, 1.47f,
R_LINE_TO, 4.93f, 5.1f,
R_LINE_TO, -4.93f, 5.09f,
R_CUBIC_TO, -0.4f, 0.41f, -0.4f, 1.06f, 0, 1.47f,
R_CUBIC_TO, 0.4f, 0.41f, 1.03f, 0.41f, 1.42f, 0,
R_LINE_TO, 3.92f, -4.05f,
R_V_LINE_TO, 6.45f,
R_CUBIC_TO, 0, 0.57f, 0.45f, 1.04f, 1.01f, 1.04f,
R_CUBIC_TO, 0.25f, 0, 0.5f, -0.1f, 0.69f, -0.28f,
R_LINE_TO, 0.05f, -0.05f,
R_LINE_TO, 4.32f, -4.46f,
R_CUBIC_TO, 0.4f, -0.41f, 0.4f, -1.07f, 0, -1.48f,
R_LINE_TO, -3.63f, -3.73f,
CLOSE
// 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, 24,
MOVE_TO, 13.57f, 18.62f,
R_V_LINE_TO, -4.3f,
R_LINE_TO, 2.08f, 2.15f,
R_LINE_TO, -2.08f, 2.15f,
CLOSE,
R_MOVE_TO, 0, -8.95f,
R_V_LINE_TO, -4.3f,
R_LINE_TO, 2.08f, 2.15f,
R_LINE_TO, -2.08f, 2.15f,
CLOSE,
R_MOVE_TO, 0.5f, 2.33f,
R_LINE_TO, 3.63f, 3.73f,
R_CUBIC_TO, 0.4f, 0.41f, 0.4f, 1.07f, 0, 1.48f,
R_LINE_TO, -4.32f, 4.46f,
R_LINE_TO, -0.05f, 0.05f,
R_CUBIC_TO, -0.19f, 0.18f, -0.43f, 0.28f, -0.69f, 0.28f,
R_CUBIC_TO, -0.56f, 0, -1.01f, -0.46f, -1.01f, -1.04f,
R_V_LINE_TO, -6.45f,
R_LINE_TO, -3.92f, 4.05f,
R_CUBIC_TO, -0.4f, 0.41f, -1.03f, 0.41f, -1.42f, 0,
R_CUBIC_TO, -0.4f, -0.41f, -0.4f, -1.06f, 0, -1.47f,
R_LINE_TO, 4.93f, -5.09f,
R_LINE_TO, -4.93f, -5.1f,
R_CUBIC_TO, -0.4f, -0.41f, -0.4f, -1.06f, 0, -1.47f,
R_CUBIC_TO, 0.4f, -0.41f, 1.03f, -0.41f, 1.42f, 0,
R_LINE_TO, 3.92f, 4.05f,
R_V_LINE_TO, -6.44f,
R_CUBIC_TO, 0, -0.26f, 0.1f, -0.52f, 0.27f, -0.71f,
R_CUBIC_TO, 0.38f, -0.42f, 1.02f, -0.44f, 1.43f, -0.05f,
R_LINE_TO, 0.03f, 0.03f,
R_LINE_TO, 4.33f, 4.47f,
R_CUBIC_TO, 0.4f, 0.41f, 0.4f, 1.07f, 0, 1.48f,
R_LINE_TO, -3.63f, 3.74f,
CLOSE,
R_MOVE_TO, -8.49f, -1.76f,
R_LINE_TO, 1.17f, 1.17f,
R_CUBIC_TO, 0.32f, 0.32f, 0.32f, 0.85f, 0, 1.17f,
R_LINE_TO, -1.17f, 1.17f,
R_CUBIC_TO, -0.32f, 0.32f, -0.85f, 0.32f, -1.17f, 0,
R_LINE_TO, -1.17f, -1.17f,
R_CUBIC_TO, -0.32f, -0.32f, -0.32f, -0.85f, 0, -1.17f,
R_LINE_TO, 1.17f, -1.17f,
R_CUBIC_TO, 0.32f, -0.32f, 0.85f, -0.32f, 1.17f, 0,
CLOSE,
R_MOVE_TO, 15, 0,
R_LINE_TO, 1.17f, 1.17f,
R_CUBIC_TO, 0.32f, 0.32f, 0.32f, 0.85f, 0, 1.17f,
R_LINE_TO, -1.17f, 1.17f,
R_CUBIC_TO, -0.32f, 0.32f, -0.85f, 0.32f, -1.17f, 0,
R_LINE_TO, -1.17f, -1.17f,
R_CUBIC_TO, -0.32f, -0.32f, -0.32f, -0.85f, 0, -1.17f,
R_LINE_TO, 1.17f, -1.17f,
R_CUBIC_TO, 0.32f, -0.32f, 0.85f, -0.32f, 1.17f, 0,
CLOSE
// 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, 16, 7.5f,
R_LINE_TO, 2.5f, 2.5f,
R_LINE_TO, -2.5f, 2.5f,
V_LINE_TO, 16,
R_H_LINE_TO, -3.5f,
LINE_TO, 10, 18.5f,
LINE_TO, 7.5f, 16,
H_LINE_TO, 4,
R_V_LINE_TO, -3.5f,
LINE_TO, 1.5f, 10,
LINE_TO, 4, 7.5f,
V_LINE_TO, 4,
R_H_LINE_TO, 3.5f,
LINE_TO, 10, 1.5f,
LINE_TO, 12.5f, 4,
H_LINE_TO, 16,
R_V_LINE_TO, 3.5f,
CLOSE,
MOVE_TO, 14, 12,
R_LINE_TO, 2, -2,
R_LINE_TO, -2, -2,
V_LINE_TO, 6,
R_H_LINE_TO, -2,
R_LINE_TO, -2, -2,
R_LINE_TO, -2, 2,
H_LINE_TO, 6,
R_V_LINE_TO, 2,
R_LINE_TO, -2, 2,
R_LINE_TO, 2, 2,
R_V_LINE_TO, 2,
R_H_LINE_TO, 2,
R_LINE_TO, 2, 2,
R_LINE_TO, 2, -2,
R_H_LINE_TO, 2,
R_V_LINE_TO, -2,
CLOSE,
R_MOVE_TO, -4, 1,
R_CUBIC_TO, 1.66f, 0, 3, -1.34f, 3, -3,
R_CUBIC_TO, 0, -1.66f, -1.34f, -3, -3, -3,
R_CUBIC_TO, -1.66f, 0, -3, 1.34f, -3, 3,
R_CUBIC_TO, 0, 1.66f, 1.34f, 3, 3, 3,
CLOSE
// 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, 24,
MOVE_TO, 1, 18,
R_V_LINE_TO, 3,
R_H_LINE_TO, 3,
R_CUBIC_TO, 0, -1.66f, -1.34f, -3, -3, -3,
CLOSE,
R_MOVE_TO, 0, -4,
R_V_LINE_TO, 2,
R_CUBIC_TO, 2.76f, 0, 5, 2.24f, 5, 5,
R_H_LINE_TO, 2,
R_CUBIC_TO, 0, -3.87f, -3.13f, -7, -7, -7,
CLOSE,
R_MOVE_TO, 18, -7,
H_LINE_TO, 5,
R_V_LINE_TO, 1.63f,
R_CUBIC_TO, 3.96f, 1.28f, 7.09f, 4.41f, 8.37f, 8.37f,
H_LINE_TO, 19,
V_LINE_TO, 7,
CLOSE,
MOVE_TO, 1, 10,
R_V_LINE_TO, 2,
R_CUBIC_TO, 4.97f, 0, 9, 4.03f, 9, 9,
R_H_LINE_TO, 2,
R_CUBIC_TO, 0, -6.08f, -4.93f, -11, -11, -11,
CLOSE,
R_MOVE_TO, 20, -7,
H_LINE_TO, 3,
R_CUBIC_TO, -1.1f, 0, -2, 0.9f, -2, 2,
R_V_LINE_TO, 3,
R_H_LINE_TO, 2,
V_LINE_TO, 5,
R_H_LINE_TO, 18,
R_V_LINE_TO, 14,
R_H_LINE_TO, -7,
R_V_LINE_TO, 2,
R_H_LINE_TO, 7,
R_CUBIC_TO, 1.1f, 0, 2, -0.9f, 2, -2,
V_LINE_TO, 5,
R_CUBIC_TO, 0, -1.1f, -0.9f, -2, -2, -2,
CLOSE
// 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, 24,
MOVE_TO, 12, 2,
CUBIC_TO, 6.48f, 2, 2, 6.48f, 2, 12,
R_CUBIC_TO, 0, 5.52f, 4.48f, 10, 10, 10,
R_CUBIC_TO, 5.52f, 0, 10, -4.48f, 10, -10,
CUBIC_TO_SHORTHAND, 17.52f, 2, 12, 2,
CLOSE,
R_MOVE_TO, 0, 18,
R_CUBIC_TO, -4.41f, 0, -8, -3.59f, -8, -8,
R_CUBIC_TO, 0, -4.41f, 3.59f, -8, 8, -8,
R_CUBIC_TO, 4.41f, 0, 8, 3.59f, 8, 8,
R_CUBIC_TO, 0, 4.41f, -3.59f, 8, -8, 8,
CLOSE,
R_MOVE_TO, -4, -9,
R_H_LINE_TO, 8,
R_CUBIC_TO, 0.55f, 0, 1, 0.45f, 1, 1,
R_CUBIC_TO, 0, 0.55f, -0.45f, 1, -1, 1,
H_LINE_TO, 8,
R_CUBIC_TO, -0.55f, 0, -1, -0.45f, -1, -1,
R_CUBIC_TO, 0, -0.55f, 0.45f, -1, 1, -1,
CLOSE
// 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, 5.41f, 14,
LINE_TO, 10, 9.06f,
LINE_TO, 14.59f, 14,
LINE_TO, 16, 12.48f,
LINE_TO, 10, 6,
LINE_TO, 4, 12.48f,
CLOSE
// 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, 24,
MOVE_TO, 20, 7,
R_V_LINE_TO, 10,
H_LINE_TO, 4,
V_LINE_TO, 7,
R_H_LINE_TO, 16,
CLOSE,
R_MOVE_TO, 0, -2,
H_LINE_TO, 4,
R_CUBIC_TO, -1.1f, 0, -1.99f, 0.9f, -1.99f, 2,
LINE_TO, 2, 17,
R_CUBIC_TO, 0, 1.1f, 0.9f, 2, 2, 2,
R_H_LINE_TO, 16,
R_CUBIC_TO, 1.1f, 0, 2, -0.9f, 2, -2,
V_LINE_TO, 7,
R_CUBIC_TO, 0, -1.1f, -0.9f, -2, -2, -2,
CLOSE,
R_MOVE_TO, -9, 3,
R_H_LINE_TO, 2,
R_V_LINE_TO, 2,
R_H_LINE_TO, -2,
V_LINE_TO, 8,
CLOSE,
R_MOVE_TO, 0, 3,
R_H_LINE_TO, 2,
R_V_LINE_TO, 2,
R_H_LINE_TO, -2,
R_V_LINE_TO, -2,
CLOSE,
MOVE_TO, 8, 8,
R_H_LINE_TO, 2,
R_V_LINE_TO, 2,
H_LINE_TO, 8,
V_LINE_TO, 8,
CLOSE,
R_MOVE_TO, 0, 3,
R_H_LINE_TO, 2,
R_V_LINE_TO, 2,
H_LINE_TO, 8,
R_V_LINE_TO, -2,
CLOSE,
R_MOVE_TO, -3, 0,
R_H_LINE_TO, 2,
R_V_LINE_TO, 2,
H_LINE_TO, 5,
R_V_LINE_TO, -2,
CLOSE,
R_MOVE_TO, 0, -3,
R_H_LINE_TO, 2,
R_V_LINE_TO, 2,
H_LINE_TO, 5,
V_LINE_TO, 8,
CLOSE,
R_MOVE_TO, 3, 6,
R_H_LINE_TO, 8,
R_V_LINE_TO, 2,
H_LINE_TO, 8,
R_V_LINE_TO, -2,
CLOSE,
R_MOVE_TO, 6, -3,
R_H_LINE_TO, 2,
R_V_LINE_TO, 2,
R_H_LINE_TO, -2,
R_V_LINE_TO, -2,
CLOSE,
R_MOVE_TO, 0, -3,
R_H_LINE_TO, 2,
R_V_LINE_TO, 2,
R_H_LINE_TO, -2,
V_LINE_TO, 8,
CLOSE,
R_MOVE_TO, 3, 3,
R_H_LINE_TO, 2,
R_V_LINE_TO, 2,
R_H_LINE_TO, -2,
R_V_LINE_TO, -2,
CLOSE,
R_MOVE_TO, 0, -3,
R_H_LINE_TO, 2,
R_V_LINE_TO, 2,
R_H_LINE_TO, -2,
V_LINE_TO, 8,
CLOSE
// 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, 6.95f, 13,
R_H_LINE_TO, 6.09f,
R_CUBIC_TO, 0.18f, 0, 0.35f, 0.11f, 0.43f, 0.28f,
R_LINE_TO, 0.48f, 1,
R_CUBIC_TO, 0.12f, 0.25f, 0.02f, 0.55f, -0.21f, 0.67f,
CUBIC_TO, 13.67f, 14.98f, 13.6f, 15, 13.52f, 15,
H_LINE_TO, 6.48f,
CUBIC_TO, 6.21f, 15, 6, 14.78f, 6, 14.5f,
R_CUBIC_TO, 0, -0.08f, 0.02f, -0.15f, 0.05f, -0.22f,
R_LINE_TO, 0.48f, -1,
CUBIC_TO, 6.61f, 13.11f, 6.77f, 13, 6.95f, 13,
CLOSE,
MOVE_TO, 6, 7.38f,
LINE_TO, 4.71f, 8.56f,
LINE_TO, 3.09f, 7.06f,
R_LINE_TO, 1.28f, -1.18f,
LINE_TO, 6, 7.38f,
CLOSE,
MOVE_TO, 3.45f, 11,
R_V_LINE_TO, 2,
H_LINE_TO, 1,
R_V_LINE_TO, -2,
R_H_LINE_TO, 2.45f,
CLOSE,
MOVE_TO, 11, 4,
R_V_LINE_TO, 2.22f,
H_LINE_TO, 9,
V_LINE_TO, 4,
R_H_LINE_TO, 2,
CLOSE,
R_MOVE_TO, 5.91f, 3.06f,
LINE_TO, 15.28f, 8.56f,
LINE_TO, 14, 7.38f,
R_LINE_TO, 1.63f, -1.5f,
R_LINE_TO, 1.28f, 1.18f,
CLOSE,
MOVE_TO, 16.55f, 11,
H_LINE_TO, 19,
R_V_LINE_TO, 2,
R_H_LINE_TO, -2.45f,
R_V_LINE_TO, -2,
CLOSE
// 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, 6.5f, 7,
V_LINE_TO, 5,
R_CUBIC_TO, 0, -1.66f, 1.84f, -3, 3.5f, -3,
R_CUBIC_TO, 1.66f, 0, 3.5f, 1.34f, 3.5f, 3,
R_V_LINE_TO, 2,
R_H_LINE_TO, 0.5f,
R_CUBIC_TO, 1.1f, 0, 2, 0.9f, 2, 2,
R_V_LINE_TO, 7,
R_CUBIC_TO, 0, 1.1f, -0.9f, 2, -2, 2,
H_LINE_TO, 6,
R_CUBIC_TO, -1.1f, 0, -2, -0.9f, -2, -2,
V_LINE_TO, 9,
R_CUBIC_TO, 0, -1.1f, 0.9f, -2, 2, -2,
R_H_LINE_TO, 0.5f,
CLOSE,
MOVE_TO, 8, 7,
R_H_LINE_TO, 4,
V_LINE_TO, 5.5f,
R_CUBIC_TO, 0, -0.5f, -0.5f, -2, -2, -2,
CUBIC_TO_SHORTHAND, 8, 5, 8, 5.5f,
V_LINE_TO, 7,
CLOSE,
MOVE_TO, 6, 9,
R_V_LINE_TO, 7,
R_H_LINE_TO, 8,
V_LINE_TO, 9,
H_LINE_TO, 6,
CLOSE,
R_MOVE_TO, 4, 5.25f,
R_CUBIC_TO, -0.97f, 0, -1.75f, -0.78f, -1.75f, -1.75f,
R_CUBIC_TO, 0, -0.97f, 0.78f, -1.75f, 1.75f, -1.75f,
R_CUBIC_TO, 0.97f, 0, 1.75f, 0.78f, 1.75f, 1.75f,
R_CUBIC_TO, 0, 0.97f, -0.78f, 1.75f, -1.75f, 1.75f,
CLOSE
// 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, 16,
MOVE_TO, 7, 14,
R_V_LINE_TO, -2,
H_LINE_TO, 5,
R_V_LINE_TO, 2,
H_LINE_TO, 2,
V_LINE_TO, 2,
R_H_LINE_TO, 8,
R_V_LINE_TO, 2,
R_H_LINE_TO, 4,
R_V_LINE_TO, 10,
H_LINE_TO, 7,
CLOSE,
MOVE_TO, 4, 8,
R_V_LINE_TO, 2,
R_H_LINE_TO, 4,
V_LINE_TO, 8,
H_LINE_TO, 4,
CLOSE,
R_MOVE_TO, 0, -4,
R_V_LINE_TO, 2,
R_H_LINE_TO, 4,
V_LINE_TO, 4,
H_LINE_TO, 4,
CLOSE,
R_MOVE_TO, 6, 2,
R_V_LINE_TO, 2,
R_H_LINE_TO, 2,
V_LINE_TO, 6,
R_H_LINE_TO, -2,
CLOSE,
R_MOVE_TO, 0, 4,
R_V_LINE_TO, 2,
R_H_LINE_TO, 2,
R_V_LINE_TO, -2,
R_H_LINE_TO, -2,
CLOSE
// 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, 10,
MOVE_TO, 5, 6.5f,
LINE_TO, 2, 3,
R_H_LINE_TO, 6,
CLOSE
// 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, 24,
MOVE_TO, 12, 2,
R_CUBIC_TO, 5.52f, 0, 10, 4.48f, 10, 10,
R_CUBIC_TO, 0, 5.52f, -4.48f, 10, -10, 10,
CUBIC_TO_SHORTHAND, 2, 17.52f, 2, 12,
CUBIC_TO_SHORTHAND, 6.48f, 2, 12, 2,
CLOSE,
R_MOVE_TO, 2, 2.39f,
CUBIC_TO, 13.26f, 4.14f, 12.47f, 4, 11.65f, 4,
CUBIC_TO, 7.42f, 4, 4, 7.58f, 4, 12,
R_CUBIC_TO, 0, 4.42f, 3.42f, 8, 7.65f, 8,
CUBIC_TO, 12.47f, 20, 13.26f, 19.86f, 14, 19.61f,
CUBIC_TO, 10.93f, 18.58f, 8.71f, 15.56f, 8.71f, 12,
R_CUBIC_TO, 0, -3.56f, 2.22f, -6.58f, 5.29f, -7.61f,
CLOSE
// 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, 14.24f, 5.76f,
R_CUBIC_TO, -0.39f, -0.39f, -0.39f, -1.02f, 0, -1.41f,
R_CUBIC_TO, 0.39f, -0.39f, 1.02f, -0.39f, 1.41f, 0,
CUBIC_TO, 17.15f, 5.83f, 18, 7.85f, 18, 10,
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, -2.15f, 0.85f, -4.17f, 2.34f, -5.66f,
R_CUBIC_TO, 0.39f, -0.39f, 1.02f, -0.39f, 1.41f, 0,
R_CUBIC_TO, 0.39f, 0.39f, 0.39f, 1.02f, 0, 1.41f,
CUBIC_TO, 4.64f, 6.88f, 4, 8.39f, 4, 10,
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, -1.61f, -0.64f, -3.12f, -1.76f, -4.24f,
CLOSE,
MOVE_TO, 9, 3,
R_CUBIC_TO, 0, -0.55f, 0.45f, -1, 1, -1,
R_CUBIC_TO, 0.55f, 0, 1, 0.45f, 1, 1,
R_V_LINE_TO, 8,
R_CUBIC_TO, 0, 0.55f, -0.45f, 1, -1, 1,
R_CUBIC_TO, -0.55f, 0, -1, -0.45f, -1, -1,
V_LINE_TO, 3,
CLOSE
// 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, 24,
MOVE_TO, 20, 16.35f,
R_LINE_TO, -5.05f, 5.05f,
R_CUBIC_TO, -0.79f, 0.79f, -2.08f, 0.79f, -2.87f, 0,
LINE_TO, 3.67f, 13,
H_LINE_TO, 6.52f,
R_LINE_TO, 7, 7,
R_LINE_TO, 5, -5,
H_LINE_TO, 17,
R_V_LINE_TO, -2,
R_H_LINE_TO, 5,
R_V_LINE_TO, 5,
R_H_LINE_TO, -2,
R_V_LINE_TO, -1.65f,
CLOSE,
MOVE_TO, 5.48f, 9,
H_LINE_TO, 7,
R_V_LINE_TO, 2,
H_LINE_TO, 2,
V_LINE_TO, 6,
R_H_LINE_TO, 2,
R_V_LINE_TO, 1.65f,
R_LINE_TO, 5.05f, -5.05f,
R_CUBIC_TO, 0.79f, -0.79f, 2.08f, -0.79f, 2.87f, 0,
LINE_TO, 20.33f, 11,
H_LINE_TO, 17.48f,
R_LINE_TO, -7, -7,
R_LINE_TO, -5, 5,
CLOSE
// 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, 24,
MOVE_TO, 5, 6,
R_H_LINE_TO, 14,
R_CUBIC_TO, 1.1f, 0, 2, 0.9f, 2, 2,
R_V_LINE_TO, 8,
R_CUBIC_TO, 0, 1.1f, -0.9f, 2, -2, 2,
H_LINE_TO, 5,
R_CUBIC_TO, -1.1f, 0, -2, -0.9f, -2, -2,
V_LINE_TO, 8,
R_CUBIC_TO, 0, -1.1f, 0.9f, -2, 2, -2,
CLOSE,
R_MOVE_TO, 0, 2,
R_V_LINE_TO, 8,
R_H_LINE_TO, 14,
V_LINE_TO, 8,
H_LINE_TO, 5,
CLOSE
// 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, 24,
MOVE_TO, 18, 5,
R_V_LINE_TO, 14,
R_CUBIC_TO, 0, 1.1f, -0.9f, 2, -2, 2,
H_LINE_TO, 8,
R_CUBIC_TO, -1.1f, 0, -2, -0.9f, -2, -2,
V_LINE_TO, 5,
R_CUBIC_TO, 0, -1.1f, 0.9f, -2, 2, -2,
R_H_LINE_TO, 8,
R_CUBIC_TO, 1.1f, 0, 2, 0.9f, 2, 2,
CLOSE,
R_MOVE_TO, -2, 0,
H_LINE_TO, 8,
R_V_LINE_TO, 14,
R_H_LINE_TO, 8,
V_LINE_TO, 5,
CLOSE
// 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, 11.48f, 18,
H_LINE_TO, 8.52f,
R_CUBIC_TO, -0.59f, 0, -1.09f, -0.42f, -1.16f, -0.99f,
R_LINE_TO, -0.22f, -1.48f,
R_CUBIC_TO, -0.22f, -0.11f, -0.42f, -0.23f, -0.63f, -0.36f,
R_LINE_TO, -1.44f, 0.56f,
R_CUBIC_TO, -0.56f, 0.2f, -1.18f, -0.02f, -1.45f, -0.51f,
R_LINE_TO, -1.46f, -2.48f,
R_CUBIC_TO, -0.28f, -0.52f, -0.16f, -1.12f, 0.29f, -1.47f,
R_LINE_TO, 1.22f, -0.93f,
R_CUBIC_TO, -0.01f, -0.12f, -0.02f, -0.23f, -0.02f, -0.36f,
R_CUBIC_TO, 0, -0.12f, 0.01f, -0.24f, 0.02f, -0.36f,
R_LINE_TO, -1.22f, -0.93f,
R_CUBIC_TO, -0.47f, -0.35f, -0.59f, -0.98f, -0.3f, -1.47f,
R_LINE_TO, 1.48f, -2.49f,
R_CUBIC_TO, 0.27f, -0.48f, 0.89f, -0.7f, 1.43f, -0.49f,
R_LINE_TO, 1.45f, 0.57f,
R_CUBIC_TO, 0.21f, -0.13f, 0.42f, -0.25f, 0.62f, -0.36f,
R_LINE_TO, 0.22f, -1.49f,
CUBIC_TO, 7.43f, 2.43f, 7.93f, 2, 8.51f, 2,
R_H_LINE_TO, 2.96f,
R_CUBIC_TO, 0.59f, 0, 1.09f, 0.42f, 1.16f, 0.99f,
R_LINE_TO, 0.22f, 1.48f,
R_CUBIC_TO, 0.22f, 0.11f, 0.42f, 0.23f, 0.63f, 0.36f,
R_LINE_TO, 1.44f, -0.56f,
R_CUBIC_TO, 0.57f, -0.2f, 1.18f, 0.02f, 1.46f, 0.51f,
R_LINE_TO, 1.47f, 2.48f,
R_CUBIC_TO, 0.29f, 0.52f, 0.16f, 1.12f, -0.29f, 1.47f,
R_LINE_TO, -1.22f, 0.93f,
R_CUBIC_TO, 0.01f, 0.12f, 0.02f, 0.23f, 0.02f, 0.36f,
R_CUBIC_TO, 0, 0.12f, -0.01f, 0.24f, -0.02f, 0.36f,
R_LINE_TO, 1.22f, 0.93f,
R_CUBIC_TO, 0.45f, 0.35f, 0.58f, 0.96f, 0.3f, 1.45f,
R_LINE_TO, -1.49f, 2.51f,
R_CUBIC_TO, -0.27f, 0.48f, -0.89f, 0.7f, -1.44f, 0.49f,
R_LINE_TO, -1.44f, -0.56f,
R_CUBIC_TO, -0.21f, 0.13f, -0.42f, 0.25f, -0.62f, 0.36f,
R_LINE_TO, -0.22f, 1.49f,
CUBIC_TO, 12.57f, 17.58f, 12.07f, 18, 11.48f, 18,
CLOSE,
R_MOVE_TO, -2.53f, -2,
R_H_LINE_TO, 2.11f,
R_LINE_TO, 0.28f, -1.85f,
R_LINE_TO, 0.41f, -0.16f,
R_CUBIC_TO, 0.34f, -0.13f, 0.67f, -0.32f, 1.03f, -0.57f,
R_LINE_TO, 0.34f, -0.25f,
R_LINE_TO, 1.82f, 0.7f,
LINE_TO, 16, 12.12f,
R_LINE_TO, -1.55f, -1.15f,
R_LINE_TO, 0.05f, -0.41f,
R_CUBIC_TO, 0.02f, -0.19f, 0.05f, -0.37f, 0.05f, -0.57f,
R_CUBIC_TO, 0, -0.2f, -0.02f, -0.39f, -0.05f, -0.57f,
R_LINE_TO, -0.05f, -0.41f,
LINE_TO, 16, 7.88f,
R_LINE_TO, -1.06f, -1.75f,
R_LINE_TO, -1.83f, 0.7f,
R_LINE_TO, -0.34f, -0.25f,
R_CUBIC_TO, -0.32f, -0.23f, -0.67f, -0.42f, -1.02f, -0.56f,
R_LINE_TO, -0.4f, -0.16f,
LINE_TO, 11.06f, 4,
H_LINE_TO, 8.95f,
R_LINE_TO, -0.28f, 1.85f,
R_LINE_TO, -0.41f, 0.15f,
R_CUBIC_TO, -0.34f, 0.14f, -0.67f, 0.32f, -1.03f, 0.57f,
R_LINE_TO, -0.34f, 0.24f,
R_LINE_TO, -1.82f, -0.69f,
LINE_TO, 4, 7.87f,
R_LINE_TO, 1.55f, 1.15f,
R_LINE_TO, -0.05f, 0.41f,
R_CUBIC_TO, -0.02f, 0.19f, -0.05f, 0.39f, -0.05f, 0.57f,
R_CUBIC_TO, 0, 0.19f, 0.02f, 0.39f, 0.05f, 0.57f,
R_LINE_TO, 0.05f, 0.41f,
LINE_TO, 4, 12.12f,
R_LINE_TO, 1.06f, 1.75f,
R_LINE_TO, 1.83f, -0.7f,
R_LINE_TO, 0.34f, 0.25f,
R_CUBIC_TO, 0.33f, 0.24f, 0.66f, 0.42f, 1.02f, 0.56f,
R_LINE_TO, 0.41f, 0.16f,
LINE_TO, 8.95f, 16,
CLOSE,
MOVE_TO, 10, 12.5f,
R_CUBIC_TO, 1.38f, 0, 2.5f, -1.12f, 2.5f, -2.5f,
R_CUBIC_TO, 0, -1.38f, -1.12f, -2.5f, -2.5f, -2.5f,
R_CUBIC_TO, -1.38f, 0, -2.5f, 1.12f, -2.5f, 2.5f,
R_CUBIC_TO, 0, 1.38f, 1.12f, 2.5f, 2.5f, 2.5f,
CLOSE
// 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, 2, 13,
R_H_LINE_TO, 3.47f,
LINE_TO, 9, 16.5f,
R_V_LINE_TO, -13,
LINE_TO, 5.47f, 7,
H_LINE_TO, 2,
R_V_LINE_TO, 6,
CLOSE,
R_MOVE_TO, 9, -6.5f,
R_V_LINE_TO, 7,
R_CUBIC_TO, 1.78f, -0.63f, 2.5f, -2.5f, 2.5f, -3.5f,
R_CUBIC_TO, 0, -1, -0.72f, -2.86f, -2.5f, -3.5f,
CLOSE,
R_MOVE_TO, 0, -2.24f,
CUBIC_TO, 13.48f, 5, 15.5f, 7.29f, 15.5f, 10,
R_CUBIC_TO, 0, 2.71f, -2.02f, 5, -4.5f, 5.74f,
V_LINE_TO, 17.5f,
R_CUBIC_TO, 3.44f, -0.78f, 6, -3.84f, 6, -7.5f,
R_CUBIC_TO, 0, -3.66f, -2.56f, -6.72f, -6, -7.5f,
R_V_LINE_TO, 1.76f,
CLOSE
// 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, 2, 13,
R_H_LINE_TO, 3.47f,
LINE_TO, 9, 16.5f,
R_V_LINE_TO, -13,
LINE_TO, 5.47f, 7,
H_LINE_TO, 2,
CLOSE
// 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, 2, 13,
R_H_LINE_TO, 3.47f,
LINE_TO, 9, 16.5f,
R_V_LINE_TO, -13,
LINE_TO, 5.47f, 7,
H_LINE_TO, 2,
R_V_LINE_TO, 6,
CLOSE,
R_MOVE_TO, 9, -6.5f,
R_V_LINE_TO, 7,
R_CUBIC_TO, 1.78f, -0.63f, 2.5f, -2.5f, 2.5f, -3.5f,
R_CUBIC_TO, 0, -1, -0.72f, -2.86f, -2.5f, -3.5f,
CLOSE
// 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, 11, 6.51f,
R_V_LINE_TO, 1.46f,
R_LINE_TO, 2.46f, 2.58f,
CUBIC_TO, 13.61f, 10.12f, 13.5f, 7.43f, 11, 6.51f,
CLOSE,
R_MOVE_TO, 3.99f, 5.82f,
R_LINE_TO, 1.19f, 1.12f,
CUBIC_TO, 16.75f, 12.33f, 17, 11.33f, 17, 9.96f,
R_CUBIC_TO, 0, -3.89f, -3, -6.84f, -6, -7.47f,
R_V_LINE_TO, 1.78f,
CUBIC_TO, 13.64f, 5.06f, 15.5f, 7.5f, 15.5f, 9.96f,
R_CUBIC_TO, 0, 0.85f, -0.19f, 1.62f, -0.51f, 2.37f,
CLOSE,
MOVE_TO, 2, 3.13f,
R_LINE_TO, 3.71f, 3.62f,
LINE_TO, 5.5f, 7,
H_LINE_TO, 2,
R_V_LINE_TO, 6,
R_H_LINE_TO, 3.5f,
LINE_TO, 9, 16.5f,
V_LINE_TO, 10,
R_LINE_TO, 4.5f, 4.35f,
R_CUBIC_TO, -0.71f, 0.5f, -0.95f, 0.86f, -2.5f, 1.39f,
R_V_LINE_TO, 1.75f,
R_CUBIC_TO, 1.47f, -0.27f, 2.45f, -0.93f, 3.56f, -1.87f,
LINE_TO, 16.87f, 18,
LINE_TO, 18, 16.87f,
R_LINE_TO, -8, -8,
LINE_TO, 3.13f, 2,
LINE_TO, 2, 3.13f,
CLOSE,
R_MOVE_TO, 5.57f, 1.7f,
LINE_TO, 9, 6.16f,
V_LINE_TO, 3.5f,
LINE_TO, 7.57f, 4.83f,
CLOSE
// 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, 24,
MOVE_TO, 12.65f, 10,
CUBIC_TO, 11.83f, 7.67f, 9.61f, 6, 7, 6,
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, 2.61f, 0, 4.83f, -1.67f, 5.65f, -4,
H_LINE_TO, 17,
R_V_LINE_TO, 4,
R_H_LINE_TO, 4,
R_V_LINE_TO, -4,
R_H_LINE_TO, 2,
R_V_LINE_TO, -4,
H_LINE_TO, 12.65f,
CLOSE,
MOVE_TO, 7, 14,
R_CUBIC_TO, -1.1f, 0, -2, -0.9f, -2, -2,
R_CUBIC_TO, 0, -1.1f, 0.9f, -2, 2, -2,
R_CUBIC_TO, 1.1f, 0, 2, 0.9f, 2, 2,
R_CUBIC_TO, 0, 1.1f, -0.9f, 2, -2, 2,
CLOSE
...@@ -20,11 +20,11 @@ const float kSliderIgnoreUpdateThreshold = 0.01; ...@@ -20,11 +20,11 @@ const float kSliderIgnoreUpdateThreshold = 0.01;
// References to the icons that correspond to different volume levels. // References to the icons that correspond to different volume levels.
const gfx::VectorIcon* const kVolumeLevelIcons[] = { const gfx::VectorIcon* const kVolumeLevelIcons[] = {
&kSystemMenuVolumeMuteIcon, // Muted. &kUnifiedMenuVolumeMuteIcon, // Muted.
&kSystemMenuVolumeLowIcon, // Low volume. &kUnifiedMenuVolumeLowIcon, // Low volume.
&kSystemMenuVolumeMediumIcon, // Medium volume. &kUnifiedMenuVolumeMediumIcon, // Medium volume.
&kSystemMenuVolumeHighIcon, // High volume. &kUnifiedMenuVolumeHighIcon, // High volume.
&kSystemMenuVolumeHighIcon, // Full volume. &kUnifiedMenuVolumeHighIcon, // Full volume.
}; };
// The maximum index of kVolumeLevelIcons. // The maximum index of kVolumeLevelIcons.
......
...@@ -29,7 +29,6 @@ BluetoothFeaturePodController::~BluetoothFeaturePodController() { ...@@ -29,7 +29,6 @@ BluetoothFeaturePodController::~BluetoothFeaturePodController() {
FeaturePodButton* BluetoothFeaturePodController::CreateButton() { FeaturePodButton* BluetoothFeaturePodController::CreateButton() {
DCHECK(!button_); DCHECK(!button_);
button_ = new FeaturePodButton(this); button_ = new FeaturePodButton(this);
button_->SetVectorIcon(kSystemMenuBluetoothIcon);
button_->ShowDetailedViewArrow(); button_->ShowDetailedViewArrow();
UpdateButton(); UpdateButton();
return button_; return button_;
...@@ -65,6 +64,7 @@ void BluetoothFeaturePodController::UpdateButton() { ...@@ -65,6 +64,7 @@ void BluetoothFeaturePodController::UpdateButton() {
button_->SetToggled(is_enabled); button_->SetToggled(is_enabled);
if (!is_enabled) { if (!is_enabled) {
button_->SetVectorIcon(kUnifiedMenuBluetoothIcon);
button_->SetLabel(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH)); button_->SetLabel(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH));
button_->SetSubLabel(l10n_util::GetStringUTF16( button_->SetSubLabel(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_BLUETOOTH_DISABLED_SHORT)); IDS_ASH_STATUS_TRAY_BLUETOOTH_DISABLED_SHORT));
...@@ -81,14 +81,17 @@ void BluetoothFeaturePodController::UpdateButton() { ...@@ -81,14 +81,17 @@ void BluetoothFeaturePodController::UpdateButton() {
} }
if (connected_devices.size() > 1) { if (connected_devices.size() > 1) {
button_->SetVectorIcon(kUnifiedMenuBluetoothConnectedIcon);
button_->SetLabel(l10n_util::GetStringUTF16( button_->SetLabel(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_BLUETOOTH_MULTIPLE_DEVICES_CONNECTED_LABEL)); IDS_ASH_STATUS_TRAY_BLUETOOTH_MULTIPLE_DEVICES_CONNECTED_LABEL));
button_->SetSubLabel(base::FormatNumber(connected_devices.size())); button_->SetSubLabel(base::FormatNumber(connected_devices.size()));
} else if (connected_devices.size() == 1) { } else if (connected_devices.size() == 1) {
button_->SetVectorIcon(kUnifiedMenuBluetoothConnectedIcon);
button_->SetLabel(connected_devices.back().display_name); button_->SetLabel(connected_devices.back().display_name);
button_->SetSubLabel(l10n_util::GetStringUTF16( button_->SetSubLabel(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_BLUETOOTH_DEVICE_CONNECTED_LABEL)); IDS_ASH_STATUS_TRAY_BLUETOOTH_DEVICE_CONNECTED_LABEL));
} else { } else {
button_->SetVectorIcon(kUnifiedMenuBluetoothIcon);
button_->SetLabel(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH)); button_->SetLabel(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH));
button_->SetSubLabel( button_->SetSubLabel(
l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH_ENABLED_SHORT)); l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH_ENABLED_SHORT));
......
...@@ -15,7 +15,7 @@ UnifiedBrightnessView::UnifiedBrightnessView( ...@@ -15,7 +15,7 @@ UnifiedBrightnessView::UnifiedBrightnessView(
UnifiedBrightnessSliderController* controller, UnifiedBrightnessSliderController* controller,
UnifiedSystemTrayModel* model) UnifiedSystemTrayModel* model)
: UnifiedSliderView(controller, : UnifiedSliderView(controller,
kSystemMenuBrightnessIcon, kUnifiedMenuBrightnessIcon,
IDS_ASH_STATUS_TRAY_BRIGHTNESS), IDS_ASH_STATUS_TRAY_BRIGHTNESS),
model_(model) { model_(model) {
button()->SetEnabled(false); button()->SetEnabled(false);
......
...@@ -26,7 +26,7 @@ CastFeaturePodController::~CastFeaturePodController() { ...@@ -26,7 +26,7 @@ CastFeaturePodController::~CastFeaturePodController() {
FeaturePodButton* CastFeaturePodController::CreateButton() { FeaturePodButton* CastFeaturePodController::CreateButton() {
button_ = new FeaturePodButton(this); button_ = new FeaturePodButton(this);
button_->SetVectorIcon(kSystemMenuCastIcon); button_->SetVectorIcon(kUnifiedMenuCastIcon);
button_->SetLabel(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_CAST_SHORT)); button_->SetLabel(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_CAST_SHORT));
button_->ShowDetailedViewArrow(); button_->ShowDetailedViewArrow();
button_->set_id(VIEW_ID_CAST_MAIN_VIEW); button_->set_id(VIEW_ID_CAST_MAIN_VIEW);
......
...@@ -47,7 +47,7 @@ IMEFeaturePodController::~IMEFeaturePodController() = default; ...@@ -47,7 +47,7 @@ IMEFeaturePodController::~IMEFeaturePodController() = default;
FeaturePodButton* IMEFeaturePodController::CreateButton() { FeaturePodButton* IMEFeaturePodController::CreateButton() {
button_ = new FeaturePodButton(this); button_ = new FeaturePodButton(this);
button_->SetVectorIcon(kSystemMenuKeyboardIcon); button_->SetVectorIcon(kUnifiedMenuKeyboardIcon);
button_->SetLabel(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_IME_SHORT)); button_->SetLabel(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_IME_SHORT));
button_->ShowDetailedViewArrow(); button_->ShowDetailedViewArrow();
Update(); Update();
......
...@@ -19,7 +19,7 @@ class UnifiedKeyboardBrightnessView : public UnifiedSliderView, ...@@ -19,7 +19,7 @@ class UnifiedKeyboardBrightnessView : public UnifiedSliderView,
UnifiedKeyboardBrightnessSliderController* controller, UnifiedKeyboardBrightnessSliderController* controller,
UnifiedSystemTrayModel* model) UnifiedSystemTrayModel* model)
: UnifiedSliderView(controller, : UnifiedSliderView(controller,
kSystemMenuKeyboardBrightnessIcon, kUnifiedMenuKeyboardBrightnessIcon,
IDS_ASH_STATUS_TRAY_BRIGHTNESS, IDS_ASH_STATUS_TRAY_BRIGHTNESS,
true /* readonly*/), true /* readonly*/),
model_(model) { model_(model) {
......
...@@ -35,7 +35,7 @@ VPNFeaturePodController::~VPNFeaturePodController() = default; ...@@ -35,7 +35,7 @@ VPNFeaturePodController::~VPNFeaturePodController() = default;
FeaturePodButton* VPNFeaturePodController::CreateButton() { FeaturePodButton* VPNFeaturePodController::CreateButton() {
DCHECK(!button_); DCHECK(!button_);
button_ = new FeaturePodButton(this); button_ = new FeaturePodButton(this);
button_->SetVectorIcon(kNetworkVpnIcon); button_->SetVectorIcon(kUnifiedMenuVpnIcon);
button_->SetLabel(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VPN_SHORT)); button_->SetLabel(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VPN_SHORT));
button_->ShowDetailedViewArrow(); button_->ShowDetailedViewArrow();
Update(); Update();
......
...@@ -22,6 +22,7 @@ NightLightFeaturePodController::~NightLightFeaturePodController() = default; ...@@ -22,6 +22,7 @@ NightLightFeaturePodController::~NightLightFeaturePodController() = default;
FeaturePodButton* NightLightFeaturePodController::CreateButton() { FeaturePodButton* NightLightFeaturePodController::CreateButton() {
DCHECK(!button_); DCHECK(!button_);
button_ = new FeaturePodButton(this); button_ = new FeaturePodButton(this);
button_->SetVectorIcon(kUnifiedMenuNightLightIcon);
button_->SetVisible( button_->SetVisible(
features::IsNightLightEnabled() && features::IsNightLightEnabled() &&
Shell::Get()->session_controller()->ShouldEnableSettings()); Shell::Get()->session_controller()->ShouldEnableSettings());
...@@ -47,8 +48,6 @@ void NightLightFeaturePodController::UpdateButton() { ...@@ -47,8 +48,6 @@ void NightLightFeaturePodController::UpdateButton() {
bool is_enabled = Shell::Get()->night_light_controller()->GetEnabled(); bool is_enabled = Shell::Get()->night_light_controller()->GetEnabled();
button_->SetToggled(is_enabled); button_->SetToggled(is_enabled);
button_->SetVectorIcon(is_enabled ? kSystemMenuNightLightOnIcon
: kSystemMenuNightLightOffIcon);
button_->SetSubLabel(l10n_util::GetStringUTF16( button_->SetSubLabel(l10n_util::GetStringUTF16(
is_enabled ? IDS_ASH_STATUS_TRAY_NIGHT_LIGHT_ON_STATE is_enabled ? IDS_ASH_STATUS_TRAY_NIGHT_LIGHT_ON_STATE
: IDS_ASH_STATUS_TRAY_NIGHT_LIGHT_OFF_STATE)); : IDS_ASH_STATUS_TRAY_NIGHT_LIGHT_OFF_STATE));
......
...@@ -72,19 +72,19 @@ void RotationLockFeaturePodController::UpdateButton() { ...@@ -72,19 +72,19 @@ void RotationLockFeaturePodController::UpdateButton() {
button_->SetToggled(rotation_locked); button_->SetToggled(rotation_locked);
if (rotation_locked && is_portrait) { if (rotation_locked && is_portrait) {
button_->SetVectorIcon(kSystemMenuRotationLockPortraitIcon); button_->SetVectorIcon(kUnifiedMenuRotationLockPortraitIcon);
button_->SetLabel(l10n_util::GetStringUTF16( button_->SetLabel(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LOCKED_LABEL)); IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LOCKED_LABEL));
button_->SetSubLabel(l10n_util::GetStringUTF16( button_->SetSubLabel(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LOCKED_VERTICAL_SUBLABEL)); IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LOCKED_VERTICAL_SUBLABEL));
} else if (rotation_locked && !is_portrait) { } else if (rotation_locked && !is_portrait) {
button_->SetVectorIcon(kSystemMenuRotationLockLandscapeIcon); button_->SetVectorIcon(kUnifiedMenuRotationLockLandscapeIcon);
button_->SetLabel(l10n_util::GetStringUTF16( button_->SetLabel(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LOCKED_LABEL)); IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LOCKED_LABEL));
button_->SetSubLabel(l10n_util::GetStringUTF16( button_->SetSubLabel(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LOCKED_HORIZONTAL_SUBLABEL)); IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LOCKED_HORIZONTAL_SUBLABEL));
} else { } else {
button_->SetVectorIcon(kSystemMenuRotationLockAutoIcon); button_->SetVectorIcon(kUnifiedMenuRotationLockAutoIcon);
button_->SetLabel(l10n_util::GetStringUTF16( button_->SetLabel(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_ROTATION_LOCK_AUTO_LABEL)); IDS_ASH_STATUS_TRAY_ROTATION_LOCK_AUTO_LABEL));
button_->SetSubLabel(l10n_util::GetStringUTF16( button_->SetSubLabel(l10n_util::GetStringUTF16(
......
...@@ -26,7 +26,7 @@ FeaturePodButton* AccessibilityFeaturePodController::CreateButton() { ...@@ -26,7 +26,7 @@ FeaturePodButton* AccessibilityFeaturePodController::CreateButton() {
auto* button = new FeaturePodButton(this); auto* button = new FeaturePodButton(this);
button->SetLabel( button->SetLabel(
l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBILITY)); l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBILITY));
button->SetVectorIcon(kSystemMenuAccessibilityIcon); button->SetVectorIcon(kUnifiedMenuAccessibilityIcon);
button->ShowDetailedViewArrow(); button->ShowDetailedViewArrow();
AccessibilityDelegate* delegate = Shell::Get()->accessibility_delegate(); AccessibilityDelegate* delegate = Shell::Get()->accessibility_delegate();
......
...@@ -25,9 +25,6 @@ namespace ash { ...@@ -25,9 +25,6 @@ namespace ash {
namespace { namespace {
// TODO(tetsui): Remove when the asset is arrived.
const int kCollapseIconSize = 20;
// Ink drop mask that masks non-standard shape of CustomShapeButton. // Ink drop mask that masks non-standard shape of CustomShapeButton.
class CustomShapeInkDropMask : public views::InkDropMask { class CustomShapeInkDropMask : public views::InkDropMask {
public: public:
...@@ -105,9 +102,9 @@ void CustomShapeButton::PaintCustomShapePath(gfx::Canvas* canvas) { ...@@ -105,9 +102,9 @@ void CustomShapeButton::PaintCustomShapePath(gfx::Canvas* canvas) {
CollapseButton::CollapseButton(views::ButtonListener* listener) CollapseButton::CollapseButton(views::ButtonListener* listener)
: CustomShapeButton(listener) { : CustomShapeButton(listener) {
SetImage(views::Button::STATE_NORMAL, SetImage(
gfx::CreateVectorIcon(kNotificationCenterCollapseIcon, views::Button::STATE_NORMAL,
kCollapseIconSize, kUnifiedMenuIconColor)); gfx::CreateVectorIcon(kUnifiedMenuExpandIcon, kUnifiedMenuIconColor));
} }
CollapseButton::~CollapseButton() = default; CollapseButton::~CollapseButton() = default;
...@@ -140,9 +137,9 @@ void CollapseButton::PaintButtonContents(gfx::Canvas* canvas) { ...@@ -140,9 +137,9 @@ void CollapseButton::PaintButtonContents(gfx::Canvas* canvas) {
gfx::ScopedCanvas scoped(canvas); gfx::ScopedCanvas scoped(canvas);
canvas->Translate(gfx::Vector2d(size().width() / 2, size().height() * 2 / 3)); canvas->Translate(gfx::Vector2d(size().width() / 2, size().height() * 2 / 3));
canvas->sk_canvas()->rotate(expanded_amount_ * 180. + 180.); canvas->sk_canvas()->rotate(expanded_amount_ * 180.);
canvas->DrawImageInt(GetImageToPaint(), -kCollapseIconSize / 2, gfx::ImageSkia image = GetImageToPaint();
-kCollapseIconSize / 2); canvas->DrawImageInt(image, -image.width() / 2, -image.height() / 2);
} }
} // namespace ash } // namespace ash
...@@ -26,9 +26,6 @@ namespace ash { ...@@ -26,9 +26,6 @@ namespace ash {
namespace { namespace {
// TODO(tetsui): Remove when the asset arrives.
constexpr int kDetailedViewArrowSize = 10;
void ConfigureFeaturePodLabel(views::Label* label) { void ConfigureFeaturePodLabel(views::Label* label) {
label->SetAutoColorReadabilityEnabled(false); label->SetAutoColorReadabilityEnabled(false);
label->SetSubpixelRenderingEnabled(false); label->SetSubpixelRenderingEnabled(false);
...@@ -111,8 +108,7 @@ FeaturePodLabelButton::FeaturePodLabelButton(views::ButtonListener* listener) ...@@ -111,8 +108,7 @@ FeaturePodLabelButton::FeaturePodLabelButton(views::ButtonListener* listener)
detailed_view_arrow_->set_can_process_events_within_subtree(false); detailed_view_arrow_->set_can_process_events_within_subtree(false);
detailed_view_arrow_->SetImage( detailed_view_arrow_->SetImage(
gfx::CreateVectorIcon(kNotificationCenterCollapseIcon, gfx::CreateVectorIcon(kUnifiedMenuMoreIcon, kUnifiedMenuIconColor));
kDetailedViewArrowSize, kUnifiedMenuIconColor));
detailed_view_arrow_->SetVisible(false); detailed_view_arrow_->SetVisible(false);
AddChildView(label_); AddChildView(label_);
......
...@@ -30,6 +30,7 @@ QuietModeFeaturePodController::~QuietModeFeaturePodController() { ...@@ -30,6 +30,7 @@ QuietModeFeaturePodController::~QuietModeFeaturePodController() {
FeaturePodButton* QuietModeFeaturePodController::CreateButton() { FeaturePodButton* QuietModeFeaturePodController::CreateButton() {
DCHECK(!button_); DCHECK(!button_);
button_ = new FeaturePodButton(this); button_ = new FeaturePodButton(this);
button_->SetVectorIcon(kUnifiedMenuDoNotDisturbIcon);
button_->SetVisible( button_->SetVisible(
Shell::Get()->session_controller()->ShouldShowNotificationTray() && Shell::Get()->session_controller()->ShouldShowNotificationTray() &&
!Shell::Get()->session_controller()->IsScreenLocked()); !Shell::Get()->session_controller()->IsScreenLocked());
...@@ -61,9 +62,6 @@ SystemTrayItemUmaType QuietModeFeaturePodController::GetUmaType() const { ...@@ -61,9 +62,6 @@ SystemTrayItemUmaType QuietModeFeaturePodController::GetUmaType() const {
} }
void QuietModeFeaturePodController::OnQuietModeChanged(bool in_quiet_mode) { void QuietModeFeaturePodController::OnQuietModeChanged(bool in_quiet_mode) {
button_->SetVectorIcon(in_quiet_mode
? kNotificationCenterDoNotDisturbOnIcon
: kNotificationCenterDoNotDisturbOffIcon);
button_->SetToggled(in_quiet_mode); button_->SetToggled(in_quiet_mode);
button_->SetSubLabel(l10n_util::GetStringUTF16( button_->SetSubLabel(l10n_util::GetStringUTF16(
in_quiet_mode ? IDS_ASH_STATUS_TRAY_NOTIFICATIONS_DO_NOT_DISTURB_SUBLABEL in_quiet_mode ? IDS_ASH_STATUS_TRAY_NOTIFICATIONS_DO_NOT_DISTURB_SUBLABEL
......
...@@ -152,20 +152,20 @@ TopShortcutsView::TopShortcutsView(UnifiedSystemTrayController* controller) ...@@ -152,20 +152,20 @@ TopShortcutsView::TopShortcutsView(UnifiedSystemTrayController* controller)
sign_out_button_ = new SignOutButton(this); sign_out_button_ = new SignOutButton(this);
container_->AddSignOutButton(sign_out_button_); container_->AddSignOutButton(sign_out_button_);
lock_button_ = new TopShortcutButton(this, kSystemMenuLockIcon, lock_button_ = new TopShortcutButton(this, kUnifiedMenuLockIcon,
IDS_ASH_STATUS_TRAY_LOCK); IDS_ASH_STATUS_TRAY_LOCK);
lock_button_->SetEnabled(can_show_web_ui && lock_button_->SetEnabled(can_show_web_ui &&
Shell::Get()->session_controller()->CanLockScreen()); Shell::Get()->session_controller()->CanLockScreen());
container_->AddChildView(lock_button_); container_->AddChildView(lock_button_);
settings_button_ = new TopShortcutButton(this, kSystemMenuSettingsIcon, settings_button_ = new TopShortcutButton(this, kUnifiedMenuSettingsIcon,
IDS_ASH_STATUS_TRAY_SETTINGS); IDS_ASH_STATUS_TRAY_SETTINGS);
settings_button_->SetEnabled(can_show_web_ui); settings_button_->SetEnabled(can_show_web_ui);
container_->AddChildView(settings_button_); container_->AddChildView(settings_button_);
bool reboot = Shell::Get()->shutdown_controller()->reboot_on_shutdown(); bool reboot = Shell::Get()->shutdown_controller()->reboot_on_shutdown();
power_button_ = new TopShortcutButton( power_button_ = new TopShortcutButton(
this, kSystemMenuPowerIcon, this, kUnifiedMenuPowerIcon,
reboot ? IDS_ASH_STATUS_TRAY_REBOOT : IDS_ASH_STATUS_TRAY_SHUTDOWN); reboot ? IDS_ASH_STATUS_TRAY_REBOOT : IDS_ASH_STATUS_TRAY_SHUTDOWN);
power_button_->set_id(VIEW_ID_POWER_BUTTON); power_button_->set_id(VIEW_ID_POWER_BUTTON);
container_->AddChildView(power_button_); container_->AddChildView(power_button_);
......
...@@ -311,7 +311,7 @@ EnterpriseManagedView::EnterpriseManagedView( ...@@ -311,7 +311,7 @@ EnterpriseManagedView::EnterpriseManagedView(
UnifiedSystemTrayController* controller) UnifiedSystemTrayController* controller)
: ManagedStateView(this, : ManagedStateView(this,
IDS_ASH_ENTERPRISE_DEVICE_MANAGED_SHORT, IDS_ASH_ENTERPRISE_DEVICE_MANAGED_SHORT,
kSystemMenuBusinessIcon), kUnifiedMenuManagedIcon),
controller_(controller) { controller_(controller) {
DCHECK(Shell::Get()); DCHECK(Shell::Get());
set_id(VIEW_ID_TRAY_ENTERPRISE); set_id(VIEW_ID_TRAY_ENTERPRISE);
......
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