Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4883a5ab authored by ztenghui's avatar ztenghui Committed by Android (Google) Code Review
Browse files

Merge "API REVIEW: VectorDrawable" into lmp-dev

parents ab3d017e a95c8abb

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -564,9 +564,9 @@ package android { 
    field public static final int fastScrollTextColor = 16843609; // 0x1010359

    field public static final int fastScrollThumbDrawable = 16843574; // 0x1010336

    field public static final int fastScrollTrackDrawable = 16843577; // 0x1010339

    field public static final int fill = 16843807; // 0x101041f

    field public static final int fillAfter = 16843197; // 0x10101bd

    field public static final int fillBefore = 16843196; // 0x10101bc

    field public static final int fillColor = 16843807; // 0x101041f

    field public static final int fillEnabled = 16843343; // 0x101024f

    field public static final int fillOpacity = 16843806; // 0x101041e

    field public static final int fillViewport = 16843130; // 0x101017a
@@ -1161,7 +1161,7 @@ package android { 
    field public static final int streamType = 16843273; // 0x1010209

    field public static final int stretchColumns = 16843081; // 0x1010149

    field public static final int stretchMode = 16843030; // 0x1010116

    field public static final int stroke = 16843809; // 0x1010421

    field public static final int strokeColor = 16843809; // 0x1010421

    field public static final int strokeLineCap = 16843815; // 0x1010427

    field public static final int strokeLineJoin = 16843816; // 0x1010428

    field public static final int strokeOpacity = 16843810; // 0x1010422

core/java/android/util/PathParser.java

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ public class PathParser { 
     * @return a deep copy of the <code>source</code>.

     */

    public static PathDataNode[] deepCopyNodes(PathDataNode[] source) {

        if (source == null) {

            return null;

        }

        PathDataNode[] copy = new PathParser.PathDataNode[source.length];

        for (int i = 0; i < source.length; i ++) {

            copy[i] = new PathDataNode(source[i]);

core/res/res/drawable-nodpi/platlogo.xml

+8 −7
Original line number Diff line number Diff line
@@ -13,27 +13,28 @@ 
    limitations under the License.

-->



<vector xmlns:android="http://schemas.android.com/apk/res/android" >

    <size android:width="400dp" android:height="400dp"/>



    <viewport android:viewportHeight="25" android:viewportWidth="25" />

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="400dp"

        android:height="400dp"

        android:viewportHeight="25"

        android:viewportWidth="25" >



    <path

        android:name="torso"

        android:pathData="m2,2 l21,0 l0,21 l-21,0 z"

        android:fill="#FFFFFFFF"

        android:fillColor="#FFFFFFFF"

        />



    <path

        android:name="|"

        android:pathData="m4,4 l8,0 l0,17 l-8,0 z"

        android:fill="#FF0000FF"

        android:fillColor="#FF0000FF"

        />



    <path

        android:name="_"

        android:pathData="m5,14 l16,0 l0,6 l-16,0 z"

        android:fill="#FFFF0000"

        android:fillColor="#FFFF0000"

        />



</vector>

core/res/res/drawable-nodpi/stat_sys_adb.xml

+6 −5
Original line number Diff line number Diff line
@@ -13,10 +13,11 @@ 
    limitations under the License.

-->



<vector xmlns:android="http://schemas.android.com/apk/res/android" >

    <size android:width="25dp" android:height="25dp"/>



    <viewport android:viewportHeight="25" android:viewportWidth="25" />

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="25dp"

        android:height="25dp"

        android:viewportHeight="25"

        android:viewportWidth="25" >



    <path

        android:name="L-card"
@@ -34,7 +35,7 @@ 
        M15,2 l3,0 l0,5 l5,0 l0,3 l-8,0



        z"

        android:fill="#FFFFFFFF"

        android:fillColor="#FFFFFFFF"

        />

core/res/res/drawable/ic_audio_ring_notif.xml

+4 −7
Original line number Diff line number Diff line
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android" >

    <size

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="32dp"

        android:height="32dp"/>



    <viewport

        android:height="32dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"/>

        android:viewportHeight="24.0">



    <path

        android:fill="#8A000000"

        android:fillColor="#8A000000"

        android:pathData="M11.5,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0C9.5,21.1 10.4,22.0 11.5,22.0zM18.0,16.0l0.0,-5.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.0,3.5C13.0,2.7 12.3,2.0 11.5,2.0C10.7,2.0 10.0,2.7 10.0,3.5l0.0,0.7c-2.9,0.7 -5.0,3.2 -5.0,6.3L5.0,16.0l-2.0,2.0l0.0,1.0l17.0,0.0l0.0,-1.0L18.0,16.0z"/>

</vector>