Bug 1325929 - Reimport certain AS VectorDrawable's using different converter r=sebastian
authorAndrzej Hunt <ahunt@mozilla.com>
Fri, 13 Jan 2017 10:18:22 -0800
changeset 329304 2c630751958a56e56114867fe4697711e3522ce9
parent 329303 9cb19aceacf0487e75b3792cdbe21e652fe3ead3
child 329305 5e752a0c17ae600803ac04e2910cbdea93b668ea
push id31203
push userkwierso@gmail.com
push dateFri, 13 Jan 2017 23:28:17 +0000
treeherdermozilla-central@671a2f8542ca [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssebastian
bugs1325929
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1325929 - Reimport certain AS VectorDrawable's using different converter r=sebastian System SVG rendering on Android 6.0 seems to be broken for certain VectorDrawable's: these three icons were being distorted, only on Android 6. Using a different SVG converter (an online converter, as opposed to the Android Studio converter), results in the icons being rendered correctly. MozReview-Commit-ID: 2INnb0clb54
mobile/android/base/resources/drawable/as_bookmark.xml
mobile/android/base/resources/drawable/as_copy.xml
mobile/android/base/resources/drawable/as_share.xml
--- a/mobile/android/base/resources/drawable/as_bookmark.xml
+++ b/mobile/android/base/resources/drawable/as_bookmark.xml
@@ -1,9 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.037,5.333l1.706,3.361 0.569,1.121 1.239,0.211 3.617,0.619 -2.617,2.851 -0.81,0.884 0.181,1.185 0.583,3.8 -3.312,-1.758 -1.179,-0.626 -1.176,0.632 -3.232,1.736 0.582,-3.788 0.184,-1.194 -0.822,-0.886 -2.633,-2.84 3.676,-0.619 1.272,-0.214 0.563,-1.161 1.609,-3.319M12.01,1a1.335,1.335 0,0 0,-1.085 0.895l-2.747,5.667 -5.877,0.99c-1.345,0.219 -1.679,1.186 -0.744,2.148l4.16,4.486 -0.969,6.311c-0.147,0.948 0.242,1.5 0.925,1.5a2,2 0,0 0,0.891 -0.249l5.457,-2.931 5.521,2.931a2,2 0,0 0,0.892 0.249c0.683,0 1.07,-0.555 0.926,-1.5l-0.966,-6.311 4.111,-4.481c0.936,-0.966 0.6,-1.934 -0.744,-2.153l-5.789,-0.99L13.1,1.9A1.333,1.333 0,0 0,12.01 1h0Z"/>
-</vector>
+        android:fillColor="#000000"
+        android:pathData="M12.037,5.33301 L13.743,8.69397 L14.312,9.815 L15.551,10.026 L19.168,10.645
+L16.551,13.496 L15.741,14.38 L15.922,15.565 L16.505,19.365 L13.193,17.607
+L12.014,16.981 L10.838,17.613 L7.60599,19.349 L8.18799,15.561 L8.37201,14.367
+L7.54999,13.481 L4.91699,10.641 L8.59299,10.022 L9.86499,9.80798 L10.428,8.64697
+L12.037,5.328 M12.01,1 A1.335,1.335,0,0,0,10.925,1.89502 L8.17802,7.56201
+L2.301,8.552 C0.956,8.771,0.62202,9.73798,1.55702,10.7 L5.71702,15.186
+L4.748,21.497 C4.60102,22.445,4.99,22.997,5.67301,22.997 A2,2,0,0,0,6.564,22.748
+L12.021,19.817 L17.542,22.748 A2,2,0,0,0,18.434,22.997
+C19.117,22.997,19.504,22.442,19.36,21.497 L18.394,15.186 L22.505,10.705
+C23.441,9.73901,23.105,8.771,21.761,8.552 L15.972,7.56201 L13.1,1.90002
+A1.333,1.333,0,0,0,12.01,1 L12.01,1 Z" />
+</vector>
\ No newline at end of file
--- a/mobile/android/base/resources/drawable/as_copy.xml
+++ b/mobile/android/base/resources/drawable/as_copy.xml
@@ -1,9 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M21.75,23h-12.5a1.25,1.25 0,0 1,-1.25 -1.25v-14.5a1.25,1.25 0,0 1,1.25 -1.25h9a1.252,1.252 0,0 1,0.884 0.366l3.5,3.5a1.252,1.252 0,0 1,0.366 0.884v11A1.25,1.25 0,0 1,21.75 23ZM10.5,20.5h10v-9.232l-2.768,-2.768L10.5,8.5v12ZM7,15.5h-3.5v-12h7.232l1.5,1.5h3.511a1.16,1.16 0,0 0,-0.109 -0.134l-3.5,-3.5A1.252,1.252 0,0 0,11.25 1h-9a1.25,1.25 0,0 0,-1.25 1.25v14.5a1.25,1.25 0,0 0,1.25 1.25L7,18v-2.5ZM18.5,12L17,12v-1.5a0.5,0.5 0,0 0,-1 0v2a0.5,0.5 0,0 0,0.5 0.5h2A0.5,0.5 0,0 0,18.5 12Z"/>
-</vector>
+        android:fillColor="#000000"
+        android:pathData="M21.75,23 L9.25,23 A1.25,1.25,0,0,1,8,21.75 L8,7.25 A1.25,1.25,0,0,1,9.25,6
+L18.25,6 A1.252,1.252,0,0,1,19.134,6.36603 L22.634,9.86603
+A1.252,1.252,0,0,1,23,10.75 L23,21.75 A1.25,1.25,0,0,1,21.75,23 Z M10.5,20.5
+L20.5,20.5 L20.5,11.268 L17.732,8.5 L10.5,8.5 L10.5,20.5 Z M7,15.5 L3.5,15.5
+L3.5,3.5 L10.732,3.5 L12.232,5 L15.743,5 A1.16,1.16,0,0,0,15.634,4.86603
+L12.134,1.36603 A1.252,1.252,0,0,0,11.25,1 L2.25,1 A1.25,1.25,0,0,0,1,2.25
+L1,16.75 A1.25,1.25,0,0,0,2.25,18 L7,18 L7,15.5 Z M18.5,12 L17,12 L17,10.5
+A0.5,0.5,0,0,0,16,10.5 L16,12.5 A0.5,0.5,0,0,0,16.5,13 L18.5,13
+A0.5,0.5,0,0,0,18.5,12 Z" />
+</vector>
\ No newline at end of file
--- a/mobile/android/base/resources/drawable/as_share.xml
+++ b/mobile/android/base/resources/drawable/as_share.xml
@@ -1,9 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,15a3.987,3.987 0,0 0,-2.839 1.18l-7.208,-3.6a3.6,3.6 0,0 0,0 -1.16l7.208,-3.6A4,4 0,1 0,15 5a3.936,3.936 0,0 0,0.047 0.58l-7.208,3.6a4,4 0,1 0,0 5.64l7.208,3.6a3.936,3.936 0,0 0,-0.047 0.58A4,4 0,1 0,19 15Z"/>
-</vector>
+        android:fillColor="#000000"
+        android:pathData="M19,15 C17.934,14.998,16.912,15.423,16.161,16.18 L8.953,12.58
+C9.016,12.196,9.016,11.804,8.953,11.42 L16.161,7.82
+C18.33,10.005,22.052,9.023,22.86,6.052 C23.668,3.081,20.956,0.349,17.979,1.135
+C16.224,1.598,15.001,3.185,15,5 C15.001,5.194,15.017,5.388,15.047,5.58
+L7.839,9.18 C5.668,6.996,1.947,7.981,1.142,10.953
+C0.336,13.925,3.049,16.655,6.026,15.867 C6.713,15.685,7.338,15.324,7.839,14.82
+L15.047,18.42 C15.017,18.612,15.001,18.806,15,19
+C15,22.079,18.333,24.004,21,22.464 C23.667,20.925,23.667,17.075,21,15.536
+C20.392,15.185,19.702,15,19,15 Z" />
+</vector>
\ No newline at end of file