Commit 271195ae authored by Francois Beaufort's avatar Francois Beaufort Committed by Commit Bot

[WebNFC] Use image instead of vector for infobar icon

On KitKat, vector drawables are not supported in chromium permissions
prompt. This CL fixes this issue by replacing the unique vector drawable
for NFC infobar icon to multiples images.

Bug: 1061916
Change-Id: Id96e7e1b496f2849b7d3bfdbb1e81db78e9c793f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2106164Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Reviewed-by: default avatarBalazs Engedy <engedy@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: François Beaufort <beaufort.francois@gmail.com>
Cr-Commit-Position: refs/heads/master@{#751355}
parent b34bce31
......@@ -273,8 +273,6 @@ Still reading?
<ignore regexp="chrome/android/java/res/drawable/zoom_in.xml"/>
<!--TODO(crbug.com/1044658): This suppression was added blindly, and needs investigated.-->
<ignore regexp="chrome/android/java/res/drawable/zoom_out.xml"/>
<!--TODO(crbug.com/1044658): This suppression was added blindly, and needs investigated.-->
<ignore regexp="components/permissions/android/res/drawable/ic_infobar_nfc.xml"/>
</issue>
<!-- This warning just adds a lot of false positives. -->
<issue id="ObsoleteSdkInt" severity="ignore"/>
......
<?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="#4285F4"/>
</vector>
......@@ -32,7 +32,7 @@ DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_MEDIA_STREAM_CAMERA,
DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_MEDIA_STREAM_MIC,
R.drawable.infobar_microphone)
DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_MIDI, R.drawable.infobar_midi)
DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_NFC, R.drawable.ic_infobar_nfc)
DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_NFC, R.drawable.infobar_nfc)
DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_NOTIFICATIONS,
R.drawable.infobar_desktop_notifications)
DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER,
......
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