From 45d18599b80e06ba64fbfe393c194d822d261258 Mon Sep 17 00:00:00 2001
From: Chet Haase <chet@google.com>
Date: Thu, 7 Oct 2010 09:27:20 -0700
Subject: [PATCH] Various fixes

Change-Id: I70509d19d1df01e998de4804bc7c1e1899ad8dee
---
 ...perty_animator.xml => object_animator.xml} |  2 +-
 .../res/layout/animator_custom_evaluator.xml  | 34 +++++++++++++++++++
 .../apis/animation/AnimationLoading.java      |  2 +-
 .../apis/animation/CustomEvaluator.java       |  2 +-
 4 files changed, 37 insertions(+), 3 deletions(-)
 rename samples/ApiDemos/res/anim/{property_animator.xml => object_animator.xml} (92%)
 create mode 100644 samples/ApiDemos/res/layout/animator_custom_evaluator.xml

diff --git a/samples/ApiDemos/res/anim/property_animator.xml b/samples/ApiDemos/res/anim/object_animator.xml
similarity index 92%
rename from samples/ApiDemos/res/anim/property_animator.xml
rename to samples/ApiDemos/res/anim/object_animator.xml
index 8c0f00683..ea84aa745 100644
--- a/samples/ApiDemos/res/anim/property_animator.xml
+++ b/samples/ApiDemos/res/anim/object_animator.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<property xmlns:android="http://schemas.android.com/apk/res/android"
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="1000"
     android:valueFrom="0"
     android:valueTo="200"
diff --git a/samples/ApiDemos/res/layout/animator_custom_evaluator.xml b/samples/ApiDemos/res/layout/animator_custom_evaluator.xml
new file mode 100644
index 000000000..42856d2f4
--- /dev/null
+++ b/samples/ApiDemos/res/layout/animator_custom_evaluator.xml
@@ -0,0 +1,34 @@
+<?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"
+    >
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        >
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Play"
+            android:id="@+id/startButton"
+            />
+    </LinearLayout>
+</LinearLayout>
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 496a004d0..f2ef3d3d2 100644
--- a/samples/ApiDemos/src/com/example/android/apis/animation/AnimationLoading.java
+++ b/samples/ApiDemos/src/com/example/android/apis/animation/AnimationLoading.java
@@ -85,7 +85,7 @@ public class AnimationLoading extends Activity {
             if (animation == null) {
                 ObjectAnimator anim =
                         (ObjectAnimator) AnimatorInflater.
-                                loadAnimator(getApplicationContext(), R.anim.property_animator);
+                                loadAnimator(getApplicationContext(), R.anim.object_animator);
                 anim.addUpdateListener(this);
                 anim.setTarget(balls.get(0));
 
diff --git a/samples/ApiDemos/src/com/example/android/apis/animation/CustomEvaluator.java b/samples/ApiDemos/src/com/example/android/apis/animation/CustomEvaluator.java
index 7b11c8046..d1018c95c 100644
--- a/samples/ApiDemos/src/com/example/android/apis/animation/CustomEvaluator.java
+++ b/samples/ApiDemos/src/com/example/android/apis/animation/CustomEvaluator.java
@@ -43,7 +43,7 @@ public class CustomEvaluator extends Activity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.animation_reversing);
+        setContentView(R.layout.animator_custom_evaluator);
         LinearLayout container = (LinearLayout) findViewById(R.id.container);
         final MyAnimationView animView = new MyAnimationView(this);
         container.addView(animView);