From eda0dbc81cdb38c48df3bddf869b942e499b3811 Mon Sep 17 00:00:00 2001
From: Chet Haase <chet@google.com>
Date: Fri, 9 Jan 2015 11:17:22 -0800
Subject: [PATCH] Add examples of animator resource files to ApiDemos

Issue #17939329 Expose multi-property and multi-keyframe capabilities in animation resources

Change-Id: If5b66b054b132b34c56b921209835793c7bbe674
---
 samples/ApiDemos/res/anim/animator.xml        |  2 ++
 samples/ApiDemos/res/anim/object_animator.xml |  2 ++
 .../ApiDemos/res/anim/object_animator_pvh.xml | 25 ++++++++++++++
 .../res/anim/object_animator_pvh_kf.xml       | 33 +++++++++++++++++++
 .../res/anim/value_animator_pvh_kf.xml        | 28 ++++++++++++++++
 .../apis/animation/AnimationLoading.java      | 24 +++++++++++++-
 6 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 samples/ApiDemos/res/anim/object_animator_pvh.xml
 create mode 100644 samples/ApiDemos/res/anim/object_animator_pvh_kf.xml
 create mode 100644 samples/ApiDemos/res/anim/value_animator_pvh_kf.xml

diff --git a/samples/ApiDemos/res/anim/animator.xml b/samples/ApiDemos/res/anim/animator.xml
index 2432f19a6..67aca3ffb 100644
--- a/samples/ApiDemos/res/anim/animator.xml
+++ b/samples/ApiDemos/res/anim/animator.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 
+<!-- BEGIN_INCLUDE(ValueAnimatorResources) -->
 <animator xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="1000"
     android:valueFrom="1"
@@ -21,3 +22,4 @@
     android:valueType="floatType"
     android:repeatCount="1"
     android:repeatMode="reverse"/>
+<!-- END_INCLUDE(ValueAnimatorResources) -->
diff --git a/samples/ApiDemos/res/anim/object_animator.xml b/samples/ApiDemos/res/anim/object_animator.xml
index 863d42353..dc503d2d2 100644
--- a/samples/ApiDemos/res/anim/object_animator.xml
+++ b/samples/ApiDemos/res/anim/object_animator.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 
+<!-- BEGIN_INCLUDE(ObjectAnimatorResources) -->
 <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="1000"
     android:valueTo="200"
@@ -21,3 +22,4 @@
     android:propertyName="y"
     android:repeatCount="1"
     android:repeatMode="reverse"/>
+<!-- END_INCLUDE(ObjectAnimatorResources) -->
diff --git a/samples/ApiDemos/res/anim/object_animator_pvh.xml b/samples/ApiDemos/res/anim/object_animator_pvh.xml
new file mode 100644
index 000000000..10c4e4d79
--- /dev/null
+++ b/samples/ApiDemos/res/anim/object_animator_pvh.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<!-- BEGIN_INCLUDE(PropertyValuesHolderResources) -->
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+                android:duration="1000"
+                android:repeatCount="1"
+                android:repeatMode="reverse">
+    <propertyValuesHolder android:propertyName="x" android:valueTo="400"/>
+    <propertyValuesHolder android:propertyName="y" android:valueTo="200"/>
+</objectAnimator>
+<!-- END_INCLUDE(PropertyValuesHolderResources) -->
diff --git a/samples/ApiDemos/res/anim/object_animator_pvh_kf.xml b/samples/ApiDemos/res/anim/object_animator_pvh_kf.xml
new file mode 100644
index 000000000..859a50849
--- /dev/null
+++ b/samples/ApiDemos/res/anim/object_animator_pvh_kf.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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:duration="1000"
+                android:repeatCount="1"
+                android:repeatMode="reverse">
+    <!-- BEGIN_INCLUDE(KeyframeResources) -->
+    <propertyValuesHolder android:propertyName="x" >
+        <keyframe android:fraction="0" android:value="800" />
+        <keyframe android:fraction=".2" android:value="1000" />
+        <keyframe android:fraction="1" android:value="400" />
+    </propertyValuesHolder>
+    <propertyValuesHolder android:propertyName="y" >
+        <keyframe/>
+        <keyframe android:value="300" />
+        <keyframe android:value="1000" />
+    </propertyValuesHolder>
+    <!-- END_INCLUDE(KeyframeResources) -->
+</objectAnimator>
diff --git a/samples/ApiDemos/res/anim/value_animator_pvh_kf.xml b/samples/ApiDemos/res/anim/value_animator_pvh_kf.xml
new file mode 100644
index 000000000..86b2e175c
--- /dev/null
+++ b/samples/ApiDemos/res/anim/value_animator_pvh_kf.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<!-- BEGIN_INCLUDE(ValueAnimatorKeyframeResources) -->
+<animator xmlns:android="http://schemas.android.com/apk/res/android"
+          android:duration="1000"
+          android:repeatCount="1"
+          android:repeatMode="reverse">
+    <propertyValuesHolder>
+        <keyframe android:fraction="0" android:value="1"/>
+        <keyframe android:fraction=".2" android:value=".4"/>
+        <keyframe android:fraction="1" android:value="0"/>
+    </propertyValuesHolder>
+</animator>
+<!-- END_INCLUDE(ValueAnimatorKeyframeResources) -->
diff --git a/samples/ApiDemos/src/com/example/android/apis/animation/AnimationLoading.java b/samples/ApiDemos/src/com/example/android/apis/animation/AnimationLoading.java
index 910ee28aa..bac4f92d5 100644
--- a/samples/ApiDemos/src/com/example/android/apis/animation/AnimationLoading.java
+++ b/samples/ApiDemos/src/com/example/android/apis/animation/AnimationLoading.java
@@ -78,6 +78,9 @@ public class AnimationLoading extends Activity {
             addBall(200, 50);
             addBall(350, 50);
             addBall(500, 50, Color.GREEN);
+            addBall(650, 50);
+            addBall(800, 50);
+            addBall(950, 50);
         }
 
         private void createAnimation() {
@@ -106,8 +109,27 @@ public class AnimationLoading extends Activity {
                         loadAnimator(appContext, R.anim.color_animator);
                 colorizer.setTarget(balls.get(3));
 
+                ObjectAnimator animPvh = (ObjectAnimator) AnimatorInflater.
+                        loadAnimator(appContext, R.anim.object_animator_pvh);
+                animPvh.setTarget(balls.get(4));
+
+
+                ObjectAnimator animPvhKf = (ObjectAnimator) AnimatorInflater.
+                        loadAnimator(appContext, R.anim.object_animator_pvh_kf);
+                animPvhKf.setTarget(balls.get(5));
+
+                ValueAnimator faderKf = (ValueAnimator) AnimatorInflater.
+                        loadAnimator(appContext, R.anim.value_animator_pvh_kf);
+                faderKf.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                    public void onAnimationUpdate(ValueAnimator animation) {
+                        balls.get(6).setAlpha((Float) animation.getAnimatedValue());
+                    }
+                });
+
                 animation = new AnimatorSet();
-                ((AnimatorSet) animation).playTogether(anim, fader, seq, colorizer);
+                ((AnimatorSet) animation).playTogether(anim, fader, seq, colorizer, animPvh,
+                        animPvhKf, faderKf);
+
             }
         }