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

Commit f6921241 authored by Tenghui Zhu's avatar Tenghui Zhu Committed by Android Git Automerger
Browse files

am 01d1acc3: Merge "AnimatedVectorDrawable Attr proof of concept" into mnc-dev 

* commit '01d1acc3':
  AnimatedVectorDrawable Attr proof of concept
parents cab811a2 01d1acc3

tests/VectorDrawableTest/AndroidManifest.xml

+10 −1
Original line number Diff line number Diff line
@@ -143,6 +143,15 @@ 
                <category android:name="com.android.test.dynamic.TEST" />

            </intent-filter>

        </activity>

        <activity

            android:name="AnimatedVectorDrawableAttr"

            android:label="AnimatedVectorDrawable Attr Test" >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />



                <category android:name="com.android.test.dynamic.TEST" />

            </intent-filter>

        </activity>

        <activity

            android:name="BoundsCheckTest"

            android:label="SetBound check" >

tests/VectorDrawableTest/res/anim/blink.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2015 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

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

    android:interpolator="@android:anim/linear_interpolator"

    android:duration="@android:integer/config_longAnimTime"

    android:repeatCount="-1"

    android:repeatMode="reverse" >



    <propertyValuesHolder

        android:propertyName="fillColor"

        android:valueType="colorType"

        android:valueFrom="#ff3838"

        android:valueTo="?attr/color1" />



</objectAnimator>

tests/VectorDrawableTest/res/drawable/animated_vector_drawable_attr_icon.xml

0 → 100644
+93 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2015 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

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

        android:width="250dp"

        android:height="250dp"

        android:viewportWidth="200"

        android:viewportHeight="200">



    <path

        android:pathData="M-3.476563,-21.275826l34.441406,18.748753 0.000000,37.497501 -34.441406,18.748756 -34.441406,-18.718758 0.000000,-37.527500z"

        android:strokeWidth="2.5"

        android:fillColor="@color/color0"

        android:strokeColor="@android:color/white"/>

    <path

        android:pathData="M65.5,-21.497507l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748756 -34.441406,-18.718754 0.000000,-37.527496z"

        android:strokeWidth="2.5"

        android:fillColor="@color/color0"

        android:strokeColor="@android:color/white"/>

    <path

        android:pathData="M202.75,-21.497507l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748760 -34.441406,-18.718758 0.000000,-37.527496z"

        android:strokeWidth="2.5"

        android:fillColor="@color/color0"

        android:strokeColor="@android:color/white"/>

    <path

        android:pathData="M134.125,-21.497505l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748756 -34.441406,-18.718758 0.000000,-37.527496z"

        android:strokeWidth="2.5"

        android:fillColor="@color/color0"

        android:strokeColor="@android:color/white"/>

    <path

        android:name="hex"

        android:pathData="M99.8125,34.752495l34.441406,18.748753 0.000000,37.497501 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527500z"

        android:strokeWidth="2.5"

        android:fillColor="?attr/color1"

        android:strokeColor="@android:color/white"/>

    <path

        android:pathData="M30.6875,34.689995l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z"

        android:strokeWidth="2.5"

        android:fillColor="@color/color0"

        android:strokeColor="@android:color/white"/>

    <path

        android:pathData="M168.3125,35.002495l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z"

        android:strokeWidth="2.5"

        android:fillColor="@color/color0"

        android:strokeColor="@android:color/white"/>

    <path

        android:pathData="M203.0,91.002495l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z"

        android:strokeWidth="2.5"

        android:fillColor="@color/color0"

        android:strokeColor="@android:color/white"/>

    <path

        android:pathData="M133.8125,91.314995l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z"

        android:strokeWidth="2.5"

        android:fillColor="@color/color3"

        android:strokeColor="@android:color/white"/>

    <path

        android:pathData="M65.0625,91.127495l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z"

        android:strokeWidth="2.5"

        android:fillColor="@color/color2"

        android:strokeColor="@android:color/white"/>

    <path

        android:pathData="M-3.25,91.189995l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z"

        android:strokeWidth="2.5"

        android:fillColor="@color/color0"

        android:strokeColor="@android:color/white"/>

    <path

        android:pathData="M31.0625,147.81499l34.441406,18.748764 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z"

        android:strokeWidth="2.5"

        android:fillColor="@color/color0"

        android:strokeColor="@android:color/white"/>

    <path

        android:pathData="M99.625,147.37749l34.441406,18.748764 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z"

        android:strokeWidth="2.5"

        android:fillColor="@color/color0"

        android:strokeColor="@android:color/white"/>

    <path

        android:pathData="M168.8125,147.50249l34.441406,18.748764 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z"

        android:strokeWidth="2.5"

        android:fillColor="@color/color0"

        android:strokeColor="@android:color/white"/>

</vector>

tests/VectorDrawableTest/res/drawable/animated_vector_drawable_attr_icon_animated.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2015 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

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

    android:drawable="@drawable/animated_vector_drawable_attr_icon" >

    <target

        android:name="hex"

        android:animation="@anim/blink" />

</animated-vector>

tests/VectorDrawableTest/res/layout/activity_animated_vector_drawable_attr.xml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical" >



    <ImageView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="50dp"

        android:src="@drawable/animated_vector_drawable_attr_icon"

        android:theme="@style/ColorTheme" />



    <ImageView

        android:id="@+id/avd"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:src="@drawable/animated_vector_drawable_attr_icon_animated"

        android:theme="@style/ColorTheme" />



</LinearLayout>