scanner: Use finalised icons for Scanner action buttons.
Use finalised icons specified in b:378002546#comment1. Bug: b:378002546 Change-Id: Iddb4ca82f6cf8d02abeba965fe4aa2f072342fa9 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6232723 Reviewed-by: Ahmed Fakhry <afakhry@chromium.org> Commit-Queue: Michelle Chen <michellegc@google.com> Reviewed-by: Michael Cui <mlcui@google.com> Cr-Commit-Position: refs/heads/main@{#1416492}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
fc5291f5a6
commit
c0bab91eb7
@ -418,6 +418,11 @@ aggregate_vector_icons("ash_vector_icons") {
|
||||
"save_desk_as_template.icon",
|
||||
"save_desk_for_later.icon",
|
||||
"scanner.icon",
|
||||
"scanner_calendar.icon",
|
||||
"scanner_clipboard.icon",
|
||||
"scanner_doc.icon",
|
||||
"scanner_new_contact.icon",
|
||||
"scanner_sheet.icon",
|
||||
"security.icon",
|
||||
"select_to_speak_next_paragraph.icon",
|
||||
"select_to_speak_next_sentence.icon",
|
||||
|
29
ash/resources/vector_icons/scanner_calendar.icon
Normal file
29
ash/resources/vector_icons/scanner_calendar.icon
Normal file
@ -0,0 +1,29 @@
|
||||
// Copyright 2025 The Chromium Authors
|
||||
// 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, 15, 5,
|
||||
H_LINE_TO, 14,
|
||||
V_LINE_TO, 3,
|
||||
H_LINE_TO, 12,
|
||||
V_LINE_TO, 5,
|
||||
H_LINE_TO, 8,
|
||||
V_LINE_TO, 3,
|
||||
H_LINE_TO, 6,
|
||||
V_LINE_TO, 5,
|
||||
H_LINE_TO, 5,
|
||||
CUBIC_TO, 3.89f, 5, 3.01f, 5.9f, 3.01f, 7,
|
||||
LINE_TO, 3, 16,
|
||||
CUBIC_TO, 3, 17.1f, 3.89f, 18, 5, 18,
|
||||
H_LINE_TO, 15,
|
||||
CUBIC_TO, 16.1f, 18, 17, 17.1f, 17, 16,
|
||||
V_LINE_TO, 7,
|
||||
CUBIC_TO, 17, 5.9f, 16.1f, 5, 15, 5,
|
||||
CLOSE,
|
||||
MOVE_TO, 15, 16,
|
||||
H_LINE_TO, 5,
|
||||
V_LINE_TO, 10,
|
||||
H_LINE_TO, 15,
|
||||
V_LINE_TO, 16,
|
||||
CLOSE
|
50
ash/resources/vector_icons/scanner_clipboard.icon
Normal file
50
ash/resources/vector_icons/scanner_clipboard.icon
Normal file
@ -0,0 +1,50 @@
|
||||
// Copyright 2025 The Chromium Authors
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
CANVAS_DIMENSIONS, 20,
|
||||
FILL_RULE_NONZERO,
|
||||
MOVE_TO, 14, 9,
|
||||
V_LINE_TO, 11,
|
||||
H_LINE_TO, 6,
|
||||
V_LINE_TO, 9,
|
||||
H_LINE_TO, 14,
|
||||
CLOSE,
|
||||
NEW_PATH,
|
||||
FILL_RULE_NONZERO,
|
||||
MOVE_TO, 12, 14,
|
||||
V_LINE_TO, 12,
|
||||
H_LINE_TO, 6,
|
||||
V_LINE_TO, 14,
|
||||
H_LINE_TO, 12,
|
||||
CLOSE,
|
||||
NEW_PATH,
|
||||
MOVE_TO, 16, 3,
|
||||
H_LINE_TO, 12.82f,
|
||||
CUBIC_TO, 12.4f, 1.84f, 11.3f, 1, 10, 1,
|
||||
CUBIC_TO, 8.7f, 1, 7.6f, 1.84f, 7.18f, 3,
|
||||
H_LINE_TO, 4,
|
||||
CUBIC_TO, 2.9f, 3, 2, 3.9f, 2, 5,
|
||||
V_LINE_TO, 16,
|
||||
CUBIC_TO, 2, 17.1f, 2.9f, 18, 4, 18,
|
||||
H_LINE_TO, 16,
|
||||
CUBIC_TO, 17.1f, 18, 18, 17.1f, 18, 16,
|
||||
V_LINE_TO, 5,
|
||||
CUBIC_TO, 18, 3.9f, 17.1f, 3, 16, 3,
|
||||
CLOSE,
|
||||
MOVE_TO, 10, 3,
|
||||
CUBIC_TO, 10.55f, 3, 11, 3.45f, 11, 4,
|
||||
CUBIC_TO, 11, 4.55f, 10.55f, 5, 10, 5,
|
||||
CUBIC_TO, 9.45f, 5, 9, 4.55f, 9, 4,
|
||||
CUBIC_TO, 9, 3.45f, 9.45f, 3, 10, 3,
|
||||
CLOSE,
|
||||
MOVE_TO, 4, 16,
|
||||
V_LINE_TO, 5,
|
||||
H_LINE_TO, 6,
|
||||
V_LINE_TO, 7,
|
||||
H_LINE_TO, 14,
|
||||
V_LINE_TO, 5,
|
||||
H_LINE_TO, 16,
|
||||
V_LINE_TO, 16,
|
||||
H_LINE_TO, 4,
|
||||
CLOSE
|
37
ash/resources/vector_icons/scanner_doc.icon
Normal file
37
ash/resources/vector_icons/scanner_doc.icon
Normal file
@ -0,0 +1,37 @@
|
||||
// Copyright 2025 The Chromium Authors
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
CANVAS_DIMENSIONS, 20,
|
||||
FILL_RULE_NONZERO,
|
||||
MOVE_TO, 7, 7,
|
||||
H_LINE_TO, 13,
|
||||
V_LINE_TO, 9,
|
||||
H_LINE_TO, 7,
|
||||
V_LINE_TO, 7,
|
||||
CLOSE,
|
||||
NEW_PATH,
|
||||
FILL_RULE_NONZERO,
|
||||
MOVE_TO, 11, 10,
|
||||
H_LINE_TO, 7,
|
||||
V_LINE_TO, 12,
|
||||
H_LINE_TO, 11,
|
||||
V_LINE_TO, 10,
|
||||
CLOSE,
|
||||
NEW_PATH,
|
||||
MOVE_TO, 5, 3,
|
||||
H_LINE_TO, 15,
|
||||
CUBIC_TO, 16.1f, 3, 17, 3.9f, 17, 5,
|
||||
V_LINE_TO, 15,
|
||||
CUBIC_TO, 17, 16.1f, 16.1f, 17, 15, 17,
|
||||
H_LINE_TO, 5,
|
||||
CUBIC_TO, 3.9f, 17, 3, 16.1f, 3, 15,
|
||||
V_LINE_TO, 5,
|
||||
CUBIC_TO, 3, 3.9f, 3.9f, 3, 5, 3,
|
||||
CLOSE,
|
||||
MOVE_TO, 5, 15,
|
||||
H_LINE_TO, 15,
|
||||
V_LINE_TO, 5,
|
||||
H_LINE_TO, 5,
|
||||
V_LINE_TO, 15,
|
||||
CLOSE
|
56
ash/resources/vector_icons/scanner_new_contact.icon
Normal file
56
ash/resources/vector_icons/scanner_new_contact.icon
Normal file
@ -0,0 +1,56 @@
|
||||
// Copyright 2025 The Chromium Authors
|
||||
// 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, 7.5f, 3,
|
||||
CUBIC_TO, 9.43f, 3, 11, 4.58f, 11, 6.5f,
|
||||
CUBIC_TO, 11, 8.43f, 9.43f, 10, 7.5f, 10,
|
||||
CUBIC_TO, 5.58f, 10, 4, 8.43f, 4, 6.5f,
|
||||
CUBIC_TO, 4, 4.58f, 5.58f, 3, 7.5f, 3,
|
||||
CLOSE,
|
||||
MOVE_TO, 7.5f, 5,
|
||||
CUBIC_TO, 6.68f, 5, 6, 5.68f, 6, 6.5f,
|
||||
CUBIC_TO, 6, 7.32f, 6.68f, 8, 7.5f, 8,
|
||||
CUBIC_TO, 8.32f, 8, 9, 7.32f, 9, 6.5f,
|
||||
CUBIC_TO, 9, 5.68f, 8.32f, 5, 7.5f, 5,
|
||||
CLOSE,
|
||||
NEW_PATH,
|
||||
FILL_RULE_NONZERO,
|
||||
MOVE_TO, 15, 6,
|
||||
H_LINE_TO, 17,
|
||||
V_LINE_TO, 8,
|
||||
H_LINE_TO, 19,
|
||||
V_LINE_TO, 10,
|
||||
H_LINE_TO, 17,
|
||||
V_LINE_TO, 12,
|
||||
H_LINE_TO, 15,
|
||||
V_LINE_TO, 10,
|
||||
H_LINE_TO, 13,
|
||||
V_LINE_TO, 8,
|
||||
H_LINE_TO, 15,
|
||||
V_LINE_TO, 6,
|
||||
CLOSE,
|
||||
NEW_PATH,
|
||||
MOVE_TO, 7.5f, 11,
|
||||
CUBIC_TO, 9.61f, 11, 13.78f, 12.03f, 13.99f, 14.09f,
|
||||
LINE_TO, 14, 14.25f,
|
||||
V_LINE_TO, 17,
|
||||
H_LINE_TO, 1,
|
||||
V_LINE_TO, 14.25f,
|
||||
CUBIC_TO, 1, 12.09f, 5.34f, 11, 7.5f, 11,
|
||||
CLOSE,
|
||||
MOVE_TO, 11.99f, 14.34f,
|
||||
CUBIC_TO, 11.99f, 14.35f, 11.97f, 14.33f, 11.93f, 14.3f,
|
||||
LINE_TO, 11.84f, 14.22f,
|
||||
CUBIC_TO, 11.62f, 14.04f, 11.26f, 13.85f, 10.82f, 13.67f,
|
||||
CUBIC_TO, 9.79f, 13.26f, 8.43f, 13, 7.5f, 13,
|
||||
CUBIC_TO, 6.57f, 13, 5.21f, 13.26f, 4.18f, 13.67f,
|
||||
CUBIC_TO, 3.74f, 13.85f, 3.38f, 14.04f, 3.16f, 14.22f,
|
||||
LINE_TO, 3.07f, 14.3f,
|
||||
CUBIC_TO, 3.02f, 14.35f, 3, 14.35f, 3, 14.33f,
|
||||
V_LINE_TO, 15,
|
||||
H_LINE_TO, 12,
|
||||
V_LINE_TO, 14.33f,
|
||||
LINE_TO, 11.99f, 14.34f,
|
||||
CLOSE
|
35
ash/resources/vector_icons/scanner_sheet.icon
Normal file
35
ash/resources/vector_icons/scanner_sheet.icon
Normal file
@ -0,0 +1,35 @@
|
||||
// Copyright 2025 The Chromium Authors
|
||||
// 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, 3,
|
||||
H_LINE_TO, 15,
|
||||
CUBIC_TO, 16.1f, 3, 17, 3.9f, 17, 5,
|
||||
V_LINE_TO, 15,
|
||||
CUBIC_TO, 17, 16.1f, 16.1f, 17, 15, 17,
|
||||
H_LINE_TO, 5,
|
||||
CUBIC_TO, 3.9f, 17, 3, 16.1f, 3, 15,
|
||||
V_LINE_TO, 5,
|
||||
CUBIC_TO, 3, 3.9f, 3.9f, 3, 5, 3,
|
||||
CLOSE,
|
||||
MOVE_TO, 5, 15,
|
||||
H_LINE_TO, 15,
|
||||
V_LINE_TO, 5,
|
||||
H_LINE_TO, 5,
|
||||
V_LINE_TO, 15,
|
||||
CLOSE,
|
||||
MOVE_TO, 10, 6,
|
||||
H_LINE_TO, 8,
|
||||
V_LINE_TO, 8,
|
||||
H_LINE_TO, 6,
|
||||
V_LINE_TO, 10,
|
||||
H_LINE_TO, 8,
|
||||
V_LINE_TO, 14,
|
||||
H_LINE_TO, 10,
|
||||
V_LINE_TO, 10,
|
||||
H_LINE_TO, 14,
|
||||
V_LINE_TO, 8,
|
||||
H_LINE_TO, 10,
|
||||
V_LINE_TO, 6,
|
||||
CLOSE
|
@ -12,7 +12,6 @@
|
||||
#include "base/memory/ref_counted_memory.h"
|
||||
#include "base/memory/scoped_refptr.h"
|
||||
#include "base/notreached.h"
|
||||
#include "chromeos/ui/vector_icons/vector_icons.h"
|
||||
#include "components/manta/proto/scanner.pb.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
||||
@ -65,18 +64,17 @@ std::u16string ScannerActionViewModel::GetText() const {
|
||||
}
|
||||
|
||||
const gfx::VectorIcon& ScannerActionViewModel::GetIcon() const {
|
||||
// TODO(b/378002546): Replace these icons with finalized icons when ready.
|
||||
switch (unpopulated_action_.action_case()) {
|
||||
case manta::proto::ScannerAction::kNewEvent:
|
||||
return kGlanceablesCalendarTodayIcon;
|
||||
return kScannerCalendarIcon;
|
||||
case manta::proto::ScannerAction::kNewContact:
|
||||
return kShelfAddPersonButtonIcon;
|
||||
return kScannerNewContactIcon;
|
||||
case manta::proto::ScannerAction::kNewGoogleDoc:
|
||||
return chromeos::kFiletypeGdocIcon;
|
||||
return kScannerDocIcon;
|
||||
case manta::proto::ScannerAction::kNewGoogleSheet:
|
||||
return chromeos::kFiletypeGsheetIcon;
|
||||
return kScannerSheetIcon;
|
||||
case manta::proto::ScannerAction::kCopyToClipboard:
|
||||
return kClipboardIcon;
|
||||
return kScannerClipboardIcon;
|
||||
case manta::proto::ScannerAction::ACTION_NOT_SET:
|
||||
// This should only be possible if `unpopulated_action_` has been
|
||||
// previously moved.
|
||||
|
Reference in New Issue
Block a user