From ce436337daa8e48a743a4e09ec3a56bb3e86006d Mon Sep 17 00:00:00 2001
From: Chet Haase <chet@google.com>
Date: Thu, 19 Aug 2010 17:55:31 -0700
Subject: [PATCH] Revert "Revert "demo multi-property animations""

This reverts commit afb6baf91595960a858c48f70bc32f14836bac52.
---
 samples/ApiDemos/AndroidManifest.xml          |   8 +
 .../res/layout/animation_multi_property.xml   |  28 +++
 .../animation/MultiPropertyAnimation.java     | 178 ++++++++++++++++++
 3 files changed, 214 insertions(+)
 create mode 100644 samples/ApiDemos/res/layout/animation_multi_property.xml
 create mode 100644 samples/ApiDemos/src/com/example/android/apis/animation/MultiPropertyAnimation.java

diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index b23bdfe98..fcfcb2010 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -838,6 +838,14 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".animation.MultiPropertyAnimation"
+                  android:label="Animation/Multiple Properties">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
         <!-- ************************************* -->
         <!--     ANIMATION PACKAGE SAMPLES         -->
         <!-- ************************************* -->
diff --git a/samples/ApiDemos/res/layout/animation_multi_property.xml b/samples/ApiDemos/res/layout/animation_multi_property.xml
new file mode 100644
index 000000000..f49c5b0db
--- /dev/null
+++ b/samples/ApiDemos/res/layout/animation_multi_property.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:id="@+id/container"
+    >
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Run"
+        android:id="@+id/startButton"
+        />
+</LinearLayout>
diff --git a/samples/ApiDemos/src/com/example/android/apis/animation/MultiPropertyAnimation.java b/samples/ApiDemos/src/com/example/android/apis/animation/MultiPropertyAnimation.java
new file mode 100644
index 000000000..df1cb0b9f
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/animation/MultiPropertyAnimation.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+
+package com.example.android.apis.animation;
+
+// Need the following import to get access to the app resources, since this
+// class is in a sub-package.
+import android.animation.*;
+import android.view.animation.AccelerateInterpolator;
+import com.example.android.apis.R;
+
+import java.util.ArrayList;
+
+import android.animation.Animatable.AnimatableListener;
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RadialGradient;
+import android.graphics.Shader;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.OvalShape;
+import android.os.Bundle;
+import android.view.View;
+import android.view.animation.BounceInterpolator;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.SeekBar;
+
+/**
+ * This application demonstrates the seeking capability of Animator. The SeekBar in the
+ * UI allows you to set the position of the animation. Pressing the Run button will play from
+ * the current position of the animation.
+ */
+public class MultiPropertyAnimation extends Activity {
+
+    private static final int DURATION = 1500;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.animation_seeking);
+        LinearLayout container = (LinearLayout) findViewById(R.id.container);
+        final MyAnimationView animView = new MyAnimationView(this);
+        container.addView(animView);
+
+        Button starter = (Button) findViewById(R.id.startButton);
+        starter.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                animView.startAnimation();
+            }
+        });
+
+    }
+
+    public class MyAnimationView extends View implements Animator.AnimatorUpdateListener {
+
+        private static final float BALL_SIZE = 100f;
+
+        public final ArrayList<ShapeHolder> balls = new ArrayList<ShapeHolder>();
+        Sequencer animation = null;
+        Animatable bounceAnim = null;
+        ShapeHolder ball = null;
+
+        public MyAnimationView(Context context) {
+            super(context);
+            addBall(50, 0);
+            addBall(150, 0);
+            addBall(250, 0);
+            addBall(350, 0);
+        }
+
+        private void createAnimation() {
+            if (bounceAnim == null) {
+                ShapeHolder ball;
+                ball = balls.get(0);
+                PropertyAnimator yBouncer = new PropertyAnimator(DURATION, ball, "y",
+                        ball.getY(), getHeight() - BALL_SIZE);
+                yBouncer.setInterpolator(new BounceInterpolator());
+                yBouncer.addUpdateListener(this);
+
+                ball = balls.get(1);
+                PropertyValuesHolder pvhY = new PropertyValuesHolder("y", ball.getY(),
+                        getHeight() - BALL_SIZE);
+                PropertyValuesHolder pvhAlpha = new PropertyValuesHolder("alpha", 1.0f,
+                        0f);
+                PropertyAnimator yAlphaBouncer = new PropertyAnimator(DURATION/2, ball, pvhY, pvhAlpha);
+                yAlphaBouncer.setInterpolator(new AccelerateInterpolator());
+                yAlphaBouncer.setRepeatCount(1);
+                yAlphaBouncer.setRepeatMode(Animator.REVERSE);
+
+
+                ball = balls.get(2);
+                PropertyValuesHolder pvhW = new PropertyValuesHolder("width", ball.getWidth(),
+                        ball.getWidth() * 2);
+                PropertyValuesHolder pvhH = new PropertyValuesHolder("height", ball.getHeight(),
+                        ball.getHeight() * 2);
+                PropertyValuesHolder pvTX = new PropertyValuesHolder("x", ball.getX(), ball.getX() - BALL_SIZE/2f);
+                PropertyValuesHolder pvTY = new PropertyValuesHolder("y", 0f, ball.getY(), ball.getY() - BALL_SIZE/2f);
+                PropertyAnimator whxyBouncer = new PropertyAnimator(DURATION/2, ball, pvhW, pvhH,
+                        pvTX, pvTY);
+                whxyBouncer.setRepeatCount(1);
+                whxyBouncer.setRepeatMode(Animator.REVERSE);
+
+                ball = balls.get(3);
+                pvhY = new PropertyValuesHolder("y", ball.getY(),
+                        getHeight() - BALL_SIZE);
+                float ballX = ball.getX();
+                Keyframe kf0 = new Keyframe(0f, ballX);
+                Keyframe kf1 = new Keyframe(.5f, ballX + 100f);
+                Keyframe kf2 = new Keyframe(1f, ballX + 50f);
+                PropertyValuesHolder pvhX = new PropertyValuesHolder("x", kf0, kf1, kf2);
+                PropertyAnimator yxBouncer = new PropertyAnimator(DURATION/2, ball, pvhY, pvhX);
+                yxBouncer.setRepeatCount(1);
+                yxBouncer.setRepeatMode(Animator.REVERSE);
+
+
+                bounceAnim = new Sequencer();
+                ((Sequencer)bounceAnim).playTogether(yBouncer, yAlphaBouncer, whxyBouncer, yxBouncer);
+            }
+        }
+
+        public void startAnimation() {
+            createAnimation();
+            bounceAnim.start();
+        }
+
+        private ShapeHolder addBall(float x, float y) {
+            OvalShape circle = new OvalShape();
+            circle.resize(BALL_SIZE, BALL_SIZE);
+            ShapeDrawable drawable = new ShapeDrawable(circle);
+            ShapeHolder shapeHolder = new ShapeHolder(drawable);
+            shapeHolder.setX(x);
+            shapeHolder.setY(y);
+            int red = (int)(100 + Math.random() * 155);
+            int green = (int)(100 + Math.random() * 155);
+            int blue = (int)(100 + Math.random() * 155);
+            int color = 0xff000000 | red << 16 | green << 8 | blue;
+            Paint paint = drawable.getPaint();
+            int darkColor = 0xff000000 | red/4 << 16 | green/4 << 8 | blue/4;
+            RadialGradient gradient = new RadialGradient(37.5f, 12.5f,
+                    50f, color, darkColor, Shader.TileMode.CLAMP);
+            paint.setShader(gradient);
+            shapeHolder.setPaint(paint);
+            balls.add(shapeHolder);
+            return shapeHolder;
+        }
+
+        @Override
+        protected void onDraw(Canvas canvas) {
+            for (ShapeHolder ball : balls) {
+                canvas.translate(ball.getX(), ball.getY());
+                ball.getShape().draw(canvas);
+                canvas.translate(-ball.getX(), -ball.getY());
+            }
+        }
+
+        public void onAnimationUpdate(Animator animation) {
+            invalidate();
+        }
+
+    }
+}
\ No newline at end of file