Commit 9171c96d authored by James Vecore's avatar James Vecore Committed by Commit Bot

[Nearby] Update settings icon

The icon has been updated and moved settings to os-settings.

Change-Id: I5acb37a20105bbb634c33525d32375e16a4045f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2424645
Commit-Queue: James Vecore <vecore@google.com>
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Auto-Submit: James Vecore <vecore@google.com>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809486}
parent e79c84b5
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<template is="dom-if" if="[[nearbySharingFeatureEnabled_]]" restamp> <template is="dom-if" if="[[nearbySharingFeatureEnabled_]]" restamp>
<div id="nearbyshare-item" class="settings-box two-line no-padding"> <div id="nearbyshare-item" class="settings-box two-line no-padding">
<div class="link-wrapper" actionable on-click="nearbyShareClick_"> <div class="link-wrapper" actionable on-click="nearbyShareClick_">
<iron-icon icon="settings:nearby-share"> <iron-icon icon="os-settings:nearby-share">
</iron-icon> </iron-icon>
<div id="nearbyShareLabel" class="middle settings-box-text" <div id="nearbyShareLabel" class="middle settings-box-text"
aria-hidden="true"> aria-hidden="true">
......
...@@ -32,7 +32,10 @@ These icons may appear blurry. ...@@ -32,7 +32,10 @@ These icons may appear blurry.
<path d="M10.01 17.99L20 5.46C19.613 5.164 15.765 2 10 2 4.227 2 .387 5.165 0 5.46l9.99 12.53.01.01.01-.01z" fill-opacity=".3"></path> <path d="M10.01 17.99L20 5.46C19.613 5.164 15.765 2 10 2 4.227 2 .387 5.165 0 5.46l9.99 12.53.01.01.01-.01z" fill-opacity=".3"></path>
<path d="M2.942 9.143l7.05 8.85L10 18l.008-.008 7.05-8.85C16.7 8.867 14.008 6.668 10 6.668s-6.7 2.2-7.058 2.476z"></path> <path d="M2.942 9.143l7.05 8.85L10 18l.008-.008 7.05-8.85C16.7 8.867 14.008 6.668 10 6.668s-6.7 2.2-7.058 2.476z"></path>
</g> </g>
<g id="nearby-share" viewBox="0 0 24 24">
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.71638 8.86876C2.24237 9.31907 2.23052 10.0656 2.69268 10.5396L3.88956 11.7839L5.53674 10.0775L4.38727 8.89246C3.93696 8.41845 3.19039 8.4066 2.71638 8.86876ZM16.2612 15.7533L17.2566 14.7342L18.9157 13.0396L21.345 10.5511C21.5701 10.3141 21.6768 10.0178 21.6768 9.72155C21.6768 9.41344 21.5583 9.10534 21.3213 8.86833C20.8591 8.41802 20.1007 8.41802 19.6504 8.89203L17.2566 11.345L15.5976 13.0396L14.5666 14.0943C13.8911 14.7935 12.9905 15.1727 12.0188 15.1727C11.1537 15.1727 10.3479 14.8646 9.70802 14.2957L8.06083 15.9903C9.15105 16.9857 10.5375 17.5427 12.0188 17.5427C13.6304 17.5427 15.1354 16.9146 16.2612 15.7533Z"></path>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.0188 8.53696C10.4072 8.53696 8.90219 9.16502 7.77641 10.3263L4.06729 14.1303L2.69266 15.5404C2.24235 16.0026 2.24235 16.761 2.71636 17.2113C3.17852 17.6616 3.93694 17.6616 4.38725 17.1876L6.78099 14.7346L8.44003 13.04L9.471 11.9854C10.1465 11.2862 11.0471 10.907 12.0188 10.907C12.8839 10.907 13.6778 11.2151 14.3296 11.7839L15.9768 10.0893C14.8866 9.09392 13.5001 8.53696 12.0188 8.53696ZM21.6768 16.3699C21.6768 16.0737 21.5701 15.7656 21.345 15.5404L20.1599 14.3199L18.5127 16.0263L19.6504 17.1995C20.1007 17.6735 20.8472 17.6853 21.3213 17.2232C21.5583 16.9862 21.6768 16.6781 21.6768 16.3699Z"></path>
</g>
<!-- Material icon from http://icons/ --> <!-- Material icon from http://icons/ -->
<g id="play-prism" viewBox="0 0 24 24"><path d="M20.18 10.88l-3.06-1.74L14.26 12l2.86 2.86 3.06-1.74c.55-.31.82-.71.82-1.12 0-.41-.27-.81-.82-1.12zM4.71 2.45l8.42 8.42 2.55-2.55-10.7-6.06c-.07-.04-.14-.07-.21-.1-.17-.07-.3.05-.15.21.03.02.06.05.09.08zm0 19.1l-.08.08c-.15.15-.02.28.15.21.07-.03.14-.06.21-.1l10.69-6.06-2.55-2.55s-7.2 7.21-8.42 8.42zM12 12L3.38 3.38c-.19-.19-.38-.07-.38.19v16.86c0 .26.19.38.38.19L12 12z"></path></g> <g id="play-prism" viewBox="0 0 24 24"><path d="M20.18 10.88l-3.06-1.74L14.26 12l2.86 2.86 3.06-1.74c.55-.31.82-.71.82-1.12 0-.41-.27-.81-.82-1.12zM4.71 2.45l8.42 8.42 2.55-2.55-10.7-6.06c-.07-.04-.14-.07-.21-.1-.17-.07-.3.05-.15.21.03.02.06.05.09.08zm0 19.1l-.08.08c-.15.15-.02.28.15.21.07-.03.14-.06.21-.1l10.69-6.06-2.55-2.55s-7.2 7.21-8.42 8.42zM12 12L3.38 3.38c-.19-.19-.38-.07-.38.19v16.86c0 .26.19.38.38.19L12 12z"></path></g>
......
...@@ -652,7 +652,7 @@ cr.define('settings', function() { ...@@ -652,7 +652,7 @@ cr.define('settings', function() {
case Icon.kMouse: case Icon.kMouse:
return 'os-settings:mouse'; return 'os-settings:mouse';
case Icon.kNearbyShare: case Icon.kNearbyShare:
return 'settings:nearby-share'; return 'os-settings:nearby-share';
case Icon.kPaintbrush: case Icon.kPaintbrush:
return 'os-settings:paint-brush'; return 'os-settings:paint-brush';
case Icon.kPenguin: case Icon.kPenguin:
......
...@@ -52,18 +52,6 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. ...@@ -52,18 +52,6 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html.
<path fill="none" d="M1 1h22v22H1z"></path> <path fill="none" d="M1 1h22v22H1z"></path>
</g> </g>
<!-- Nearby Share -->
<g id="nearby-share" viewBox="0 0 24 24">
<path d="M2.89375 12.3095C3.93964 12.3095 4.7875 11.4616 4.7875 10.4157C4.7875 9.36983 3.93964 8.52197 2.89375 8.52197C1.84786 8.52197 1 9.36983 1 10.4157C1 11.4616 1.84786 12.3095 2.89375 12.3095Z" fill="#5F6368"></path>
<path d="M17.1066 12.3095C18.1525 12.3095 19.0004 11.4616 19.0004 10.4157C19.0004 9.36983 18.1525 8.52197 17.1066 8.52197C16.0608 8.52197 15.2129 9.36983 15.2129 10.4157C15.2129 11.4616 16.0608 12.3095 17.1066 12.3095Z" fill="#5F6368"></path>
<path d="M9.99988 6.54172L9.97363 6.51172L9.99988 6.54172Z" fill="#5F6368"></path>
<path d="M9.56828 6.10984L6.12777 2.66933C5.75799 2.29955 5.15846 2.29955 4.78868 2.66933C4.4189 3.0391 4.4189 3.63863 4.78868 4.00841L8.2292 7.44892L9.56828 6.10984Z" fill="#5F6368"></path>
<path d="M8.12459 8.40549C7.86062 8.66944 7.65124 8.9828 7.50838 9.32768C7.36552 9.67256 7.29199 10.0422 7.29199 10.4155C7.29199 10.7888 7.36552 11.1584 7.50838 11.5033C7.65124 11.8482 7.86062 12.1615 8.12459 12.4255L8.25584 12.5567L9.62459 11.2142L9.49334 11.083C9.40147 10.9975 9.32787 10.8942 9.27695 10.7795C9.22604 10.6648 9.19887 10.541 9.19709 10.4155C9.19678 10.2908 9.22115 10.1673 9.26877 10.0521C9.3164 9.93693 9.38635 9.83229 9.47459 9.74424L15.2099 4.00891C15.5798 3.63906 15.5798 3.03942 15.2099 2.66957V2.66957C14.8403 2.29995 14.2411 2.29969 13.8712 2.66898L8.12459 8.40549Z" fill="#5F6368"></path>
<path d="M11.3381 12.951L9.99902 14.29L10.0017 14.2927L11.3408 12.9536L11.3381 12.951Z" fill="#5F6368"></path>
<path d="M11.7326 13.3435L10.3936 14.6826L13.8712 18.1603C14.241 18.53 14.8405 18.53 15.2103 18.1603C15.5801 17.7905 15.5801 17.191 15.2103 16.8212L11.7326 13.3435Z" fill="#5F6368"></path>
<path d="M11.8751 12.4253C12.1391 12.1614 12.3485 11.848 12.4913 11.5031C12.6342 11.1583 12.7077 10.7886 12.7077 10.4153C12.7077 10.042 12.6342 9.6724 12.4913 9.32752C12.3485 8.98265 12.1391 8.66928 11.8751 8.40533L11.7476 8.27783L10.4089 9.61658L10.5364 9.74783C10.6228 9.83587 10.6909 9.94023 10.7366 10.0548C10.7823 10.1694 10.8047 10.292 10.8026 10.4153C10.8029 10.54 10.7786 10.6635 10.7309 10.7787C10.6833 10.8939 10.6134 10.9985 10.5251 11.0866L4.78979 16.8219C4.41994 17.1918 4.41994 17.7914 4.78979 18.1613V18.1613C5.1594 18.5309 5.75859 18.5311 6.12854 18.1618L11.8751 12.4253Z" fill="#5F6368"></path>
</g>
<!-- Permissions & Content Settings SVG --> <!-- Permissions & Content Settings SVG -->
<g id="permissions"> <g id="permissions">
<path d="M3 17v2h6v-2H3zM3 5v2h10V5H3zm10 16v-2h8v-2h-8v-2h-2v6h2zM7 9v2H3v2h4v2h2V9H7zm14 4v-2H11v2h10zm-6-4h2V7h4V5h-4V3h-2v6z"></path> <path d="M3 17v2h6v-2H3zM3 5v2h10V5H3zm10 16v-2h8v-2h-8v-2h-2v6h2zM7 9v2H3v2h4v2h2V9H7zm14 4v-2H11v2h10zm-6-4h2V7h4V5h-4V3h-2v6z"></path>
......
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