Commit 5b1a6d49 authored by Reilly Grant's avatar Reilly Grant Committed by Commit Bot

idle-detection: Update icon for permission

This change updates the icon used for the "idle-detection" permission
to the Material Design "person" icon.

Screenshot: https://photos.app.goo.gl/JwVUKqXkBsssYrTE8

Bug: 878979
Change-Id: Id790417d92e04cd7e517736c3eac66747b315c51
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2421634Reviewed-by: default avatarEmily Stark <estark@chromium.org>
Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Auto-Submit: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809645}
parent 18321dca
......@@ -94,6 +94,7 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html.
<g id="palette"><path d="M12 3c-4.97 0-9 4.03-9 9s4.03 9 9 9c.83 0 1.5-.67 1.5-1.5 0-.39-.15-.74-.39-1.01-.23-.26-.38-.61-.38-.99 0-.83.67-1.5 1.5-1.5H16c2.76 0 5-2.24 5-5 0-4.42-4.03-8-9-8zm-5.5 9c-.83 0-1.5-.67-1.5-1.5S5.67 9 6.5 9 8 9.67 8 10.5 7.33 12 6.5 12zm3-4C8.67 8 8 7.33 8 6.5S8.67 5 9.5 5s1.5.67 1.5 1.5S10.33 8 9.5 8zm5 0c-.83 0-1.5-.67-1.5-1.5S13.67 5 14.5 5s1.5.67 1.5 1.5S15.33 8 14.5 8zm3 4c-.83 0-1.5-.67-1.5-1.5S16.67 9 17.5 9s1.5.67 1.5 1.5-.67 1.5-1.5 1.5z"></path></g>
<g id="payment-handler"><path d="M20 4H4c-1.11 0-1.99.89-1.99 2L2 18c0 1.11.89 2 2 2h16c1.11 0 2-.89 2-2V6c0-1.11-.89-2-2-2zm0 14H4v-6h16v6zm0-10H4V6h16v2z"></path></g>
<g id="insecure-content"><path d="M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z"></path></g>
<g id="person"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path></g>
<g id="photo"><path d="M21 19V5c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z"></path></g>
<g id="power-settings-new"><path d="M13 3h-2v10h2V3zm4.83 2.17l-1.42 1.42C17.99 7.86 19 9.81 19 12c0 3.87-3.13 7-7 7s-7-3.13-7-7c0-2.19 1.01-4.14 2.58-5.42L6.17 5.17C4.23 6.82 3 9.26 3 12c0 4.97 4.03 9 9 9s9-4.03 9-9c0-2.74-1.23-5.18-3.17-6.83z"></path></g>
<g id="protocol-handler"><path d="M21.72 11.33l-6.644-7.035a.97.97 0 0 0-1.38-.01l-1.67 1.72-1.617-1.712a.97.97 0 0 0-1.38-.01l-6.737 6.935c-.187.191-.29.447-.292.719-.002.272.099.529.28.722l6.644 7.034a.949.949 0 0 0 1.38.011l1.671-1.718 1.615 1.71a.949.949 0 0 0 1.381.01l6.74-6.935a1.054 1.054 0 0 0 .01-1.44zM6.947 12.464l3.657 3.785-.974.98-5.273-5.456 5.349-5.378.929.962-3.677 3.7a.998.998 0 0 0-.292.702 1 1 0 0 0 .28.705zm7.35 4.768l-.931-.963 3.68-3.7a1.012 1.012 0 0 0 .007-1.407l-3.656-3.784.974-.98 5.273 5.456-5.348 5.378z"></path></g>
......@@ -113,7 +114,6 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html.
<g id="web"><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-5 14H4v-4h11v4zm0-5H4V9h11v4zm5 5h-4V9h4v9z"></path></g>
</if>
<g id="window-placement"><path d="M21 1H8c-1.1 0-2 .9-2 2v6H3c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h13c1.1 0 2-.9 2-2v-6h3c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2zm-5 20H3v-8h13v8zm5-8h-3v-2c0-1.1-.9-2-2-2H8V5h13v8z"></path></g>
<g id="idle-detection"><path d="M21,10.12h-6.78l2.74-2.82c-2.73-2.7-7.15-2.8-9.88-0.1c-2.73,2.71-2.73,7.08,0,9.79s7.15,2.71,9.88,0 C18.32,15.65,19,14.08,19,12.1h2c0,1.98-0.88,4.55-2.64,6.29c-3.51,3.48-9.21,3.48-12.72,0c-3.5-3.47-3.53-9.11-0.02-12.58 s9.14-3.47,12.65,0L21,3V10.12z M12.5,8v4.25l3.5,2.08l-0.72,1.21L11,13V8H12.5z"></path></g>
<g id="zoom-in"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path></g>
<g id="font-access"><path d="M0 0h24v24H0V0z" fill="none"></path><path d="M20 2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm0 18H4V4h16v16zM10.69 6h2.6l4.51 12h-2.5l-1.01-2.87H9.7L8.7 18H6.2l4.49-12zm2.87 7.06l-1.06-3.02-.43-1.44h-.13l-.44 1.44-1.07 3.02h3.13z"></path></g>
</defs>
......
......@@ -232,7 +232,7 @@
</site-details-permission>
<site-details-permission
category="[[ContentSettingsTypes.IDLE_DETECTION]]"
icon="settings:idle-detection"
icon="settings:person"
label="$i18n{siteSettingsIdleDetection}">
</site-details-permission>
<template is="dom-if" if="[[enableExperimentalWebPlatformFeatures_]]">
......
......@@ -143,7 +143,7 @@ function getCategoryItemMap() {
route: routes.SITE_SETTINGS_IDLE_DETECTION,
id: Id.IDLE_DETECTION,
label: 'siteSettingsIdleDetection',
icon: 'settings:idle-detection',
icon: 'settings:person',
enabledLabel: 'siteSettingsIdleDetectionAsk',
disabledLabel: 'siteSettingsIdleDetectionBlock',
},
......
......@@ -639,7 +639,7 @@ const gfx::ImageSkia PageInfoUI::GetPermissionIcon(
icon = &vector_icons::kVideogameAssetIcon;
break;
case ContentSettingsType::IDLE_DETECTION:
icon = &vector_icons::kIdleDetectionIcon;
icon = &vector_icons::kPersonIcon;
break;
default:
// All other |ContentSettingsType|s do not have icons on desktop or are
......
<?xml version="1.0" encoding="utf-8"?>
<!--Copyright 2020 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.-->
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:targetApi="21" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M21,10.12h-6.78l2.74,-2.82c-2.73,-2.7 -7.15,-2.8 -9.88,-0.1c-2.73,2.71 -2.73,7.08 0,9.79s7.15,2.71 9.88,0C18.32,15.65 19,14.08 19,12.1h2c0,1.98 -0.88,4.55 -2.64,6.29c-3.51,3.48 -9.21,3.48 -12.72,0c-3.5,-3.47 -3.53,-9.11 -0.02,-12.58s9.14,-3.47 12.65,0L21,3V10.12zM12.5,8v4.25l3.5,2.08l-0.72,1.21L11,13V8H12.5z" android:fillColor="#000000"/>
<path android:pathData="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z" android:fillColor="#000000"/>
</vector>
......@@ -105,7 +105,7 @@ PermissionRequest::IconId PermissionRequestImpl::GetIconId() const {
case ContentSettingsType::FONT_ACCESS:
return vector_icons::kFontDownloadIcon;
case ContentSettingsType::IDLE_DETECTION:
return vector_icons::kIdleDetectionIcon;
return vector_icons::kPersonIcon;
default:
NOTREACHED();
return vector_icons::kExtensionIcon;
......
......@@ -42,7 +42,6 @@ aggregate_vector_icons("components_vector_icons") {
"headset.icon",
"help.icon",
"help_outline.icon",
"idle_detection.icon",
"info_outline.icon",
"insert_drive_file_outline.icon",
"launch.icon",
......@@ -65,6 +64,7 @@ aggregate_vector_icons("components_vector_icons") {
"open_in_new.icon",
"page_info_content_paste.icon",
"pause.icon",
"person.icon",
"photo.icon",
"play_arrow.icon",
"protected_content.icon",
......
// Copyright 2020 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, 21, 10.12f,
R_H_LINE_TO, -6.78f,
R_LINE_TO, 2.74f, -2.82f,
R_CUBIC_TO, -2.73f, -2.7f, -7.15f, -2.8f, -9.88f, -0.1f,
R_CUBIC_TO, -2.73f, 2.71f, -2.73f, 7.08f, 0, 9.79f,
R_CUBIC_TO, 2.73f, 2.71f, 7.15f, 2.71f, 9.88f, 0,
CUBIC_TO, 18.32f, 15.65f, 19, 14.08f, 19, 12.1f,
R_H_LINE_TO, 2,
R_CUBIC_TO, 0, 1.98f, -0.88f, 4.55f, -2.64f, 6.29f,
R_CUBIC_TO, -3.51f, 3.48f, -9.21f, 3.48f, -12.72f, 0,
R_CUBIC_TO, -3.5f, -3.47f, -3.53f, -9.11f, -0.02f, -12.58f,
R_CUBIC_TO, 3.51f, -3.47f, 9.14f, -3.47f, 12.65f, 0,
LINE_TO, 21, 3,
V_LINE_TO, 10.12f,
CLOSE,
MOVE_TO, 12.5f, 8,
R_V_LINE_TO, 4.25f,
R_LINE_TO, 3.5f, 2.08f,
R_LINE_TO, -0.72f, 1.21f,
LINE_TO, 11, 13,
V_LINE_TO, 8,
H_LINE_TO, 12.5f,
CLOSE
// Copyright 2020 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, 12,
R_CUBIC_TO, 2.21f, 0, 4, -1.79f, 4, -4,
R_CUBIC_TO, 0, -2.21f, -1.79f, -4, -4, -4,
R_CUBIC_TO, -2.21f, 0, -4, 1.79f, -4, 4,
R_CUBIC_TO, 0, 2.21f, 1.79f, 4, 4, 4,
CLOSE,
R_MOVE_TO, 0, 2,
R_CUBIC_TO, -2.67f, 0, -8, 1.34f, -8, 4,
R_V_LINE_TO, 2,
R_H_LINE_TO, 16,
R_V_LINE_TO, -2,
R_CUBIC_TO, 0, -2.66f, -5.33f, -4, -8, -4,
CLOSE
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