Merge "Test bundle format in AppCompat" into nyc-dev

This commit is contained in:
Tenghui Zhu
2016-04-29 16:22:56 +00:00
committed by Android (Google) Code Review
4 changed files with 190 additions and 2 deletions

View File

@@ -17,7 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.support.vectordrawable" > package="com.example.android.support.vectordrawable" >
<uses-sdk android:minSdkVersion="11" /> <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="23"/>
<application android:icon="@drawable/app_sample_code" android:label="AnimatedVectorDrawableCompatTest" > <application android:icon="@drawable/app_sample_code" android:label="AnimatedVectorDrawableCompatTest" >
<activity android:name="com.example.android.support.vectordrawable.app.AnimatedButtonBackground" /> <activity android:name="com.example.android.support.vectordrawable.app.AnimatedButtonBackground" />

View File

@@ -0,0 +1,187 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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:aapt="http://schemas.android.com/aapt"
xmlns:android="http://schemas.android.com/apk/res/android">
<aapt:attr name="android:drawable">
<vector
android:width="32dp"
android:viewportWidth="32"
android:height="32dp"
android:viewportHeight="32">
<group
android:name="btn_radio_to_off_mtrl_0"
android:translateX="16"
android:translateY="16">
<group
android:name="ring_outer">
<path
android:name="ring_outer_path"
android:strokeColor="#FF000000"
android:strokeWidth="2"
android:pathData="M 0.0,-9.0 c 4.9705627482,0.0 9.0,4.0294372518 9.0,9.0 c 0.0,4.9705627482 -4.0294372518,9.0 -9.0,9.0 c -4.9705627482,0.0 -9.0,-4.0294372518 -9.0,-9.0 c 0.0,-4.9705627482 4.0294372518,-9.0 9.0,-9.0 Z"/>
</group>
<group
android:name="dot_group">
<path
android:name="dot_path"
android:pathData="M 0.0,-5.0 c -2.7619934082,0.0 -5.0,2.2380065918 -5.0,5.0 c 0.0,2.7619934082 2.2380065918,5.0 5.0,5.0 c 2.7619934082,0.0 5.0,-2.2380065918 5.0,-5.0 c 0.0,-2.7619934082 -2.2380065918,-5.0 -5.0,-5.0 Z"
android:fillColor="#FF000000"/>
</group>
</group>
</vector>
</aapt:attr>
<target android:name="ring_outer">
<aapt:attr name="android:animation">
<set>
<set
android:ordering="sequentially" >
<objectAnimator
android:duration="183"
android:propertyName="scaleX"
android:valueFrom="1.0"
android:valueTo="0.9"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate" />
<objectAnimator
android:duration="16"
android:propertyName="scaleX"
android:valueFrom="0.9"
android:valueTo="0.5"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate" />
<objectAnimator
android:duration="300"
android:propertyName="scaleX"
android:valueFrom="0.5"
android:valueTo="1.0"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate" />
</set>
<set
android:ordering="sequentially" >
<objectAnimator
android:duration="183"
android:propertyName="scaleY"
android:valueFrom="1.0"
android:valueTo="0.9"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate" />
<objectAnimator
android:duration="16"
android:propertyName="scaleY"
android:valueFrom="0.9"
android:valueTo="0.5"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate" />
<objectAnimator
android:duration="300"
android:propertyName="scaleY"
android:valueFrom="0.5"
android:valueTo="1.0"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate" />
</set>
</set>
</aapt:attr>
</target>
<target android:name="ring_outer_path">
<aapt:attr name="android:animation">
<set>
<set
android:ordering="sequentially">
<objectAnimator
android:duration="183"
android:propertyName="strokeWidth"
android:valueFrom="2.0"
android:valueTo="2.0"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate"/>
<objectAnimator
android:duration="16"
android:propertyName="strokeWidth"
android:valueFrom="2.0"
android:valueTo="18.0"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate"/>
<objectAnimator
android:duration="300"
android:propertyName="strokeWidth"
android:valueFrom="18.0"
android:valueTo="2.0"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate"/>
</set>
</set>
</aapt:attr>
</target>
<target
android:name="dot_group">
<aapt:attr name="android:animation">
<set>
<set
android:ordering="sequentially">
<objectAnimator
android:duration="183"
android:propertyName="scaleX"
android:valueFrom="1.0"
android:valueTo="1.4"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate"/>
<objectAnimator
android:duration="16"
android:propertyName="scaleX"
android:valueFrom="1.4"
android:valueTo="0.0"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate"/>
<objectAnimator
android:duration="300"
android:propertyName="scaleX"
android:valueFrom="0.0"
android:valueTo="0.0"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate"/>
</set>
<set
android:ordering="sequentially">
<objectAnimator
android:duration="183"
android:propertyName="scaleY"
android:valueFrom="1.0"
android:valueTo="1.4"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate"/>
<objectAnimator
android:duration="16"
android:propertyName="scaleY"
android:valueFrom="1.4"
android:valueTo="0.0"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate"/>
<objectAnimator
android:duration="300"
android:propertyName="scaleY"
android:valueFrom="0.0"
android:valueTo="0.0"
android:valueType="floatType"
android:interpolator="@android:interpolator/accelerate_decelerate"/>
</set>
</set>
</aapt:attr>
</target>
</animated-vector>

View File

@@ -37,6 +37,7 @@ public class AnimatedButtonBackground extends Activity implements View.OnClickLi
protected int[] icon = { protected int[] icon = {
R.drawable.animation_vector_drawable_grouping_1, R.drawable.animation_vector_drawable_grouping_1,
R.drawable.animation_vector_progress_bar, R.drawable.animation_vector_progress_bar,
R.drawable.btn_radio_on_to_off_bundle,
}; };

View File

@@ -17,7 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.support.vectordrawable" > package="com.example.android.support.vectordrawable" >
<uses-sdk android:minSdkVersion="7"/> <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="23"/>
<application android:icon="@drawable/app_sample_code" android:label="VectorDrawableCompatTest" > <application android:icon="@drawable/app_sample_code" android:label="VectorDrawableCompatTest" >
<activity android:name=".app.SimpleButtonBackground" /> <activity android:name=".app.SimpleButtonBackground" />