Skip to content

Commit 21257d2

Browse files
author
Alexander Alekseev
committed
ChromeOS OOBE: update HID detection screen icons to SVG.
TBR=alemate@chromium.org (cherry picked from commit 6c33b71) Bug: 747138 Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Change-Id: I77e1b33f74f91e5918d9a74f9a79cd8b0de79fc6 Reviewed-on: https://chromium-review.googlesource.com/580675 Reviewed-by: Achuith Bhandarkar <achuith@chromium.org> Commit-Queue: Alexander Alekseev <alemate@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#488794} Reviewed-on: https://chromium-review.googlesource.com/585676 Reviewed-by: Alexander Alekseev <alemate@chromium.org> Cr-Commit-Position: refs/branch-heads/3163@{#51} Cr-Branched-From: ff259ba-refs/heads/master@{#488528}
1 parent d36e48f commit 21257d2

File tree

2 files changed

+50
-9
lines changed

2 files changed

+50
-9
lines changed

chrome/browser/resources/chromeos/login/oobe_hid_detection.css

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@
88

99
#keyboard-icon,
1010
#mouse-icon {
11-
height: 40px;
12-
width: 40px;
11+
--iron-icon-height: 32px;
12+
--iron-icon-width: 32px;
13+
padding-right: 8px;
1314
}
1415

1516
#keyboard-tick,
1617
#mouse-tick {
1718
-webkit-margin-start: -28px;
1819
position: relative;
19-
top: 4px; /* icon is 40x40, tick is 32x32, 4 = (40-32)/2 */
20+
top: 4px;
2021
}
2122

2223
#hid-keyboard-pincode {

chrome/browser/resources/chromeos/login/oobe_hid_detection.html

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,42 @@
1111
</svg>
1212
</iron-iconset-svg>
1313

14+
<iron-iconset-svg name="oobe-hid-detection-20" size="20">
15+
<svg>
16+
<defs>
17+
<g id="mouse" fill="none" fill-rule="evenodd">
18+
<path d="M0 0h20v20H0"></path>
19+
<path d="M10.833.892V7.5h5.834c0-3.4-2.546-6.2-5.834-6.608zM3.333 12.5c0 3.683 2.984 6.667 6.667 6.667s6.667-2.984 6.667-6.667V9.167H3.333V12.5zM9.167.892C5.88 1.3 3.333 4.1 3.333 7.5h5.834V.892z" fill="#5A5A5A">
20+
</path>
21+
</g>
22+
<g id="keyboard" fill="none" fill-rule="evenodd">
23+
<path d="M16.667 4.167H3.333c-.92 0-1.658.745-1.658 1.666l-.008 8.334c0 .92.746 1.666 1.666 1.666h13.334c.92 0 1.666-.745 1.666-1.666V5.833c0-.92-.745-1.666-1.666-1.666zm-7.5 2.5h1.666v1.666H9.167V6.667zm0 2.5h1.666v1.666H9.167V9.167zm-2.5-2.5h1.666v1.666H6.667V6.667zm0 2.5h1.666v1.666H6.667V9.167zm-.834 1.666H4.167V9.167h1.666v1.666zm0-2.5H4.167V6.667h1.666v1.666zm7.5 5.834H6.667V12.5h6.666v1.667zm0-3.334h-1.666V9.167h1.666v1.666zm0-2.5h-1.666V6.667h1.666v1.666zm2.5 2.5h-1.666V9.167h1.666v1.666zm0-2.5h-1.666V6.667h1.666v1.666z" fill="#5A5A5A">
24+
</path>
25+
<path d="M0 0h20v20H0V0zm0 0h20v20H0V0z" fill="#D8D8D8">
26+
</path>
27+
</g>
28+
</defs>
29+
</svg>
30+
</iron-iconset-svg>
31+
32+
<iron-iconset-svg name="oobe-hid-detection-40" size="40">
33+
<svg>
34+
<defs>
35+
<g id="mouse" fill="none" fill-rule="evenodd">
36+
<path d="M0 0h40v40H0"></path>
37+
<path d="M21 1.783V15h11.667c0-6.8-5.092-12.4-11.667-13.217zm-1 35.55c7.183 0 13-5.966 13-13.333v-7H7v7c0 7.367 5.818 13.333 13 13.333zM19 1.78C12.237 2.597 7 8.198 7 15h12V1.78z" fill="#5A5A5A">
38+
</path>
39+
</g>
40+
<g id="keyboard" fill="none" fill-rule="evenodd">
41+
<path d="M33.333 8.333H6.667c-1.842 0-3.317 1.492-3.317 3.334l-.017 16.666c0 1.842 1.492 3.334 3.334 3.334h26.666c1.842 0 3.334-1.492 3.334-3.334V11.667c0-1.842-1.492-3.334-3.334-3.334zm-15 5h3.334v3.334h-3.334v-3.334zm0 5h3.334v3.334h-3.334v-3.334zm-5-5h3.334v3.334h-3.334v-3.334zm0 5h3.334v3.334h-3.334v-3.334zm-1.666 3.334H8.333v-3.334h3.334v3.334zm0-5H8.333v-3.334h3.334v3.334zm15 11.666H13.333V25h13.334v3.333zm0-6.666h-3.334v-3.334h3.334v3.334zm0-5h-3.334v-3.334h3.334v3.334zm5 5h-3.334v-3.334h3.334v3.334zm0-5h-3.334v-3.334h3.334v3.334z" fill="#5A5A5A">
42+
</path>
43+
<path d="M0 0h40v40H0V0zm0 0h40v40H0V0z" fill="#D8D8D8">
44+
</path>
45+
</g>
46+
</defs>
47+
</svg>
48+
</iron-iconset-svg>
49+
1450
<dom-module id="oobe-hid-detection-md">
1551
<template>
1652
<link rel="stylesheet" href="oobe_hid_detection.css">
@@ -26,9 +62,11 @@ <h1 class="title" i18n-content="hidDetectionInvitation"></h1>
2662
</div>
2763
<div class="footer flex layout vertical">
2864
<div class="layout vertical justified hid-selection-entry">
29-
<div class="layout horizontal center">
30-
<img id="mouse-icon" alt=""
31-
src="chrome://theme/IDR_BLUETOOTH_MOUSE">
65+
<div class="flex layout horizontal center">
66+
<hd-iron-icon id="mouse-icon" alt=""
67+
icon1x="oobe-hid-detection-20:mouse"
68+
icon2x="oobe-hid-detection-40:mouse">
69+
</hd-iron-icon>
3270
<img id="mouse-tick" alt=""
3371
hidden="[[!tickIsVisible_(mouseState_)]]"
3472
src="chrome://theme/IDR_BLUETOOTH_PAIRING_TICK">
@@ -51,9 +89,11 @@ <h1 class="title" i18n-content="hidDetectionInvitation"></h1>
5189
</div>
5290
</div>
5391
<div class="layout vertical hid-selection-entry">
54-
<div class="layout horizontal center">
55-
<img id="keyboard-icon" alt=""
56-
src="chrome://theme/IDR_BLUETOOTH_KEYBOARD">
92+
<div class="flex layout horizontal center">
93+
<hd-iron-icon id="keyboard-icon" alt=""
94+
icon1x="oobe-hid-detection-20:keyboard"
95+
icon2x="oobe-hid-detection-40:keyboard">
96+
</hd-iron-icon>
5797
<img id="keyboard-tick" alt=""
5898
hidden="[[!tickIsVisible_(keyboardState_)]]"
5999
src="chrome://theme/IDR_BLUETOOTH_PAIRING_TICK">

0 commit comments

Comments
 (0)