Commit 13cf6417 authored by Francois Beaufort's avatar Francois Beaufort Committed by Commit Bot

[WebNFC] Use png image instead of vector for settings icon

This CL replaces the vectorized icon for NFC settings with png images
so that it can be decoded in the Page Info UI. Without this, icon was
not visible.

Screenshots: https://photos.app.goo.gl/k7wz55v9ELVTS19i8

Bug: 520391
Change-Id: I356a15a24e4cfdb9d236cb92b6b45355564e3327
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1932541Reviewed-by: default avatarPeter Conn <peconn@chromium.org>
Reviewed-by: default avatarFinnur Thorarinsson <finnur@chromium.org>
Commit-Queue: François Beaufort <beaufort.francois@gmail.com>
Cr-Commit-Position: refs/heads/master@{#719115}
parent 62b27f8a
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2019 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"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,20L4,20L4,4h16v16zM18,6h-5c-1.1,0 -2,0.9 -2,2v2.28c-0.6,0.35 -1,0.98 -1,1.72 0,1.1 0.9,2 2,2s2,-0.9 2,-2c0,-0.74 -0.4,-1.38 -1,-1.72L13,8h3v8L8,16L8,8h2L10,6L6,6v12h12L18,6z"
android:fillColor="#000000"/>
</vector>
...@@ -162,7 +162,7 @@ public class ContentSettingsResources { ...@@ -162,7 +162,7 @@ public class ContentSettingsResources {
new ResourceItem(R.drawable.permission_midi, 0, new ResourceItem(R.drawable.permission_midi, 0,
R.string.midi_sysex_permission_title, null, null, 0, 0)); R.string.midi_sysex_permission_title, null, null, 0, 0));
localMap.put(ContentSettingsType.NFC, localMap.put(ContentSettingsType.NFC,
new ResourceItem(R.drawable.ic_settings_nfc, R.string.nfc_permission_title, new ResourceItem(R.drawable.settings_nfc, R.string.nfc_permission_title,
R.string.nfc_permission_title, ContentSettingValues.ASK, R.string.nfc_permission_title, ContentSettingValues.ASK,
ContentSettingValues.BLOCK, R.string.website_settings_category_nfc_ask, ContentSettingValues.BLOCK, R.string.website_settings_category_nfc_ask,
R.string.website_settings_category_nfc_blocked)); R.string.website_settings_category_nfc_blocked));
......
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