Bug 1330986 - Remove all remaining VectorDrawable arc curves r=sebastian

The support library on Android 4 seems have two unrelated VectorDrawable issues:
 - overzealous proguarding results in drawable corruption (already fixed)
 - arc curves can result in the entire drawable disappearing

This patch fixes the latter issue, by converting all remaining VectorDrawables
(some had already been fixed in a separate bug where arc curves caused corruption
on Android 6).

MozReview-Commit-ID: 2oWRXDnDZ3v

--HG--
extra : rebase_source : bd5413e304360d5ab18b95b2855f65e07a6d8a09
This commit is contained in:
Andrzej Hunt 2017-02-02 10:04:45 -08:00
Родитель 4c291daf62
Коммит 1a996c5384
7 изменённых файлов: 20 добавлений и 41 удалений

Просмотреть файл

@ -5,5 +5,5 @@
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M20.75,5L16,5v-2.75a1.252,1.252 0,0 0,-1.25 -1.25h-5.5a1.252,1.252 0,0 0,-1.25 1.25L8,5h-4.75a1.25,1.25 0,0 0,0 2.5L5,7.5v14.25a1.252,1.252 0,0 0,1.25 1.25h11.5a1.252,1.252 0,0 0,1.25 -1.25L19,7.5h1.75A1.25,1.25 0,0 0,20.75 5ZM10.5,3.5h3v1.5h-3v-1.5ZM16.5,20.5h-9v-13h9v13ZM10.5,18h0a0.5,0.5 0,0 1,-0.5 -0.5v-7a0.5,0.5 0,0 1,0.5 -0.5h0a0.5,0.5 0,0 1,0.5 0.5v7A0.5,0.5 0,0 1,10.5 18ZM13.5,18h0a0.5,0.5 0,0 1,-0.5 -0.5v-7a0.5,0.5 0,0 1,0.5 -0.5h0a0.5,0.5 0,0 1,0.5 0.5v7A0.5,0.5 0,0 1,13.5 18Z"/> android:pathData="M20.75,5L16,5L16,2.25C15.999,1.56 15.44,1.001 14.75,1L9.25,1C8.56,1.001 8.001,1.56 8,2.25L8,5L3.25,5C2.288,5 1.686,6.042 2.167,6.875C2.391,7.262 2.803,7.5 3.25,7.5L5,7.5L5,21.75C5.001,22.44 5.56,22.999 6.25,23L17.75,23C18.44,22.999 18.999,22.44 19,21.75L19,7.5L20.75,7.5C21.712,7.5 22.314,6.458 21.833,5.625C21.609,5.238 21.197,5 20.75,5ZM10.5,3.5L13.5,3.5L13.5,5L10.5,5L10.5,3.5ZM16.5,20.5L7.5,20.5L7.5,7.5L16.5,7.5L16.5,20.5ZM10.5,18L10.5,18C10.224,18 10,17.776 10,17.5L10,10.5C10,10.224 10.224,10 10.5,10L10.5,10C10.776,10 11,10.224 11,10.5L11,17.5C11,17.776 10.776,18 10.5,18ZM13.5,18L13.5,18C13.224,18 13,17.776 13,17.5L13,10.5C13,10.224 13.224,10 13.5,10L13.5,10C13.776,10 14,10.224 14,10.5L14,17.5C14,17.776 13.776,18 13.5,18Z"/>
</vector> </vector>

Просмотреть файл

@ -1,21 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportWidth="24.0"
android:viewportHeight="24"> android:viewportHeight="24.0">
<path <path
android:fillColor="#000000" android:fillColor="#FF000000"
android:pathData="M12.037,5.33301 L13.743,8.69397 L14.312,9.815 L15.551,10.026 L19.168,10.645 android:pathData="M12.037,5.333L13.743,8.694L14.312,9.815L15.551,10.026L19.168,10.645L16.551,13.496L15.741,14.38L15.922,15.565L16.505,19.365L13.193,17.607L12.014,16.981L10.838,17.613L7.606,19.349L8.188,15.561L8.372,14.367L7.55,13.481L4.917,10.641L8.593,10.022L9.865,9.808L10.428,8.647L12.037,5.328M12.01,1C11.508,1.068 11.087,1.415 10.925,1.895L8.178,7.562L2.301,8.552C0.956,8.771 0.622,9.738 1.557,10.7L5.717,15.186L4.748,21.497C4.601,22.445 4.99,22.997 5.673,22.997C5.985,22.985 6.291,22.899 6.564,22.748L12.021,19.817L17.542,22.748C17.816,22.9 18.121,22.985 18.434,22.997C19.117,22.997 19.504,22.442 19.36,21.497L18.394,15.186L22.505,10.705C23.441,9.739 23.105,8.771 21.761,8.552L15.972,7.562L13.1,1.9C12.939,1.416 12.516,1.067 12.01,1L12.01,1Z"/>
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> </vector>

Просмотреть файл

@ -1,19 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportWidth="24.0"
android:viewportHeight="24"> android:viewportHeight="24.0">
<path <path
android:fillColor="#000000" android:fillColor="#FF000000"
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 android:pathData="M21.75,23L9.25,23C8.56,23 8,22.44 8,21.75L8,7.25C8,6.56 8.56,6 9.25,6L18.25,6C18.582,6 18.899,6.132 19.134,6.366L22.634,9.866C22.868,10.101 23,10.419 23,10.75L23,21.75C23,22.44 22.44,23 21.75,23ZM10.5,20.5L20.5,20.5L20.5,11.268L17.732,8.5L10.5,8.5L10.5,20.5ZM7,15.5L3.5,15.5L3.5,3.5L10.732,3.5L12.232,5L15.743,5C15.71,4.953 15.674,4.908 15.634,4.866L12.134,1.366C11.899,1.132 11.582,1 11.25,1L2.25,1C1.56,1 1,1.56 1,2.25L1,16.75C1,17.44 1.56,18 2.25,18L7,18L7,15.5ZM18.5,12L17,12L17,10.5C17,10.115 16.583,9.875 16.25,10.067C16.095,10.156 16,10.321 16,10.5L16,12.5C16,12.776 16.224,13 16.5,13L18.5,13C18.885,13 19.125,12.583 18.933,12.25C18.844,12.095 18.679,12 18.5,12Z"/>
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> </vector>

Просмотреть файл

@ -5,5 +5,5 @@
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M13.779,12l7.867,-7.866a1.25,1.25 0,0 0,-1.768 -1.768l-7.866,7.866 -7.866,-7.866a1.25,1.25 0,1 0,-1.768 1.768L10.244,12l-7.866,7.866a1.25,1.25 0,0 0,1.768 1.768l7.866,-7.866 7.866,7.866a1.25,1.25 0,0 0,1.768 -1.768Z"/> android:pathData="M13.779,12L21.646,4.134C22.326,3.453 22.015,2.292 21.086,2.042C20.654,1.927 20.194,2.05 19.878,2.366L12.012,10.232L4.146,2.366C3.466,1.685 2.304,1.997 2.054,2.926C1.939,3.358 2.062,3.818 2.378,4.134L10.244,12L2.378,19.866C1.698,20.547 2.009,21.708 2.938,21.958C3.37,22.073 3.83,21.95 4.146,21.634L12.012,13.768L19.878,21.634C20.559,22.315 21.72,22.003 21.97,21.074C22.085,20.642 21.962,20.182 21.646,19.866Z"/>
</vector> </vector>

Просмотреть файл

@ -5,5 +5,5 @@
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M18.012,22.969h-4v-6h-4v6h-4a1.075,1.075 0,0 1,-1 -1v-8.5a1.091,1.091 0,0 1,0.5 -1l5.5,-5.5a1.413,1.413 0,0 1,2 0l5.5,5.5a1.538,1.538 0,0 1,0.5 1v8.5A1.075,1.075 0,0 1,18.012 22.969ZM22.012,13.281a1.246,1.246 0,0 1,-0.884 -0.366l-9.116,-9.116 -9.116,9.116a1.25,1.25 0,0 1,-1.768 -1.768l10,-10a1.251,1.251 0,0 1,1.768 0l10,10A1.25,1.25 0,0 1,22.012 13.281Z"/> android:pathData="M18.012,22.969L14.012,22.969L14.012,16.969L10.012,16.969L10.012,22.969L6.012,22.969C5.475,22.933 5.048,22.506 5.012,21.969L5.012,13.469C4.982,13.069 5.174,12.685 5.512,12.469L11.012,6.969C11.564,6.416 12.46,6.416 13.012,6.969L18.512,12.469C18.798,12.728 18.977,13.085 19.012,13.469L19.012,21.969C18.976,22.506 18.549,22.933 18.012,22.969ZM22.012,13.281C21.68,13.281 21.362,13.15 21.128,12.915L12.012,3.799L2.896,12.915C2.215,13.595 1.054,13.284 0.804,12.355C0.689,11.923 0.812,11.463 1.128,11.147L11.128,1.147C11.616,0.659 12.408,0.659 12.896,1.147L22.896,11.147C23.577,11.827 23.265,12.989 22.336,13.238C22.23,13.267 22.121,13.281 22.012,13.281Z"/>
</vector> </vector>

Просмотреть файл

@ -5,5 +5,6 @@
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M18,17.823c-2.29,0 -3.873,-2.692 -6.069,-2.692s-3.916,2.692 -6.069,2.692c-2.826,0 -4.912,-2.616 -4.946,-7.1 -0.021,-2.783 0.829,-3.671 4.5,-3.671s4.742,1.468 6.519,1.468 2.852,-1.468 6.519,-1.468 4.517,0.888 4.5,3.671C22.909,15.207 20.823,17.823 18,17.823ZM7.21,10.481c-2.229,0.1 -3.147,1.393 -3.147,1.713s1.478,1.224 2.923,1.224 3.147,-0.518 3.147,-0.979A2.611,2.611 0,0 0,7.207 10.481ZM16.652,10.481a2.611,2.611 0,0 0,-2.923 1.958c0,0.461 1.7,0.979 3.147,0.979s2.923,-0.9 2.923,-1.224S18.878,10.576 16.649,10.481Z"/> android:pathData="M18,17.823C15.71,17.823 14.127,15.131 11.931,15.131C9.735,15.131 8.015,17.823 5.862,17.823C3.036,17.823 0.95,15.207 0.916,10.723C0.895,7.94 1.745,7.052 5.416,7.052C9.087,7.052 10.158,8.52 11.935,8.52C13.712,8.52 14.787,7.052 18.454,7.052C22.121,7.052 22.971,7.94 22.954,10.723C22.909,15.207 20.823,17.823 18,17.823ZM7.21,10.481C4.981,10.581 4.063,11.874 4.063,12.194C4.063,12.514 5.541,13.418 6.986,13.418C8.431,13.418 10.133,12.9 10.133,12.439C9.811,11.128 8.542,10.279 7.207,10.481ZM16.652,10.481C15.318,10.281 14.051,11.129 13.729,12.439C13.729,12.9 15.429,13.418 16.876,13.418C18.323,13.418 19.799,12.518 19.799,12.194C19.799,11.87 18.878,10.576 16.649,10.481Z"/>
</vector> </vector>

Просмотреть файл

@ -5,5 +5,5 @@
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M22,20.015L2,20.015a1.266,1.266 0,0 1,-1.266 -1.266v-2.531A1.266,1.266 0,0 1,2 14.952c0.618,0 1.248,-3.239 1.484,-4.459 0.622,-3.2 1.266,-6.508 3.971,-6.508h9.09c2.705,0 3.349,3.309 3.971,6.508 0.236,1.22 0.866,4.459 1.484,4.459a1.266,1.266 0,0 1,1.266 1.266v2.531A1.266,1.266 0,0 1,22 20.015ZM3.266,17.483h17.468v-0.3c-1.668,-0.883 -2.193,-3.583 -2.7,-6.21 -0.237,-1.219 -0.867,-4.459 -1.485,-4.459h-9.09c-0.618,0 -1.248,3.24 -1.485,4.459 -0.511,2.627 -1.036,5.327 -2.7,6.21v0.3Z"/> android:pathData="M22,20.015L2,20.015C1.301,20.015 0.734,19.448 0.734,18.749L0.734,16.218C0.734,15.519 1.301,14.952 2,14.952C2.618,14.952 3.248,11.713 3.484,10.493C4.106,7.293 4.75,3.985 7.455,3.985L16.545,3.985C19.25,3.985 19.894,7.294 20.516,10.493C20.752,11.713 21.382,14.952 22,14.952C22.699,14.952 23.266,15.519 23.266,16.218L23.266,18.749C23.266,19.448 22.699,20.015 22,20.015ZM3.266,17.483L20.734,17.483L20.734,17.183C19.066,16.3 18.541,13.6 18.034,10.973C17.797,9.754 17.167,6.514 16.549,6.514L7.459,6.514C6.841,6.514 6.211,9.754 5.974,10.973C5.463,13.6 4.938,16.3 3.274,17.183L3.274,17.483Z"/>
</vector> </vector>