commit a76a150ff18c84db7736769b0476d90c9126a40a
author Ji-Hwan Lee <jihwan@google.com> Sat May 17 17:21:03 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 17 17:21:04 2014 +0000
tree 3989bbf6385eef34586e9b606733cd6049018c76
parent f967a5486a78db244624fde4c105aa5e6fa914b9
parent 80fe183c34d862839546ed214e5f69a427cc73d8

Merge "Fix build"

tests/HwAccelerationTest/src/com/android/test/hwui/CirclePropActivity.java

diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/CirclePropActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/CirclePropActivity.java
index 4938579..5b0aa66 100644
--- a/tests/HwAccelerationTest/src/com/android/test/hwui/CirclePropActivity.java
+++ b/tests/HwAccelerationTest/src/com/android/test/hwui/CirclePropActivity.java
@@ -108,7 +108,6 @@
 
             mToggle = !mToggle;
 
-            /*
             mRunningAnimations.add(new RenderNodeAnimator(
                     mX, mToggle ? 400.0f : 200.0f));
 
@@ -131,7 +130,8 @@
                 RenderNodeAnimator anim = mRunningAnimations.get(i);
                 anim.setInterpolator(interp);
                 anim.setDuration(1000);
-                anim.start(this);
+                anim.setTarget(this);
+                anim.start();
             }
 
             if (mToggle) {
@@ -147,7 +147,6 @@
                     }
                 });
             }
-            */
             return true;
         }
     }

tests/RenderThreadTest/src/com/example/renderthread/MainActivity.java

diff --git a/tests/RenderThreadTest/src/com/example/renderthread/MainActivity.java b/tests/RenderThreadTest/src/com/example/renderthread/MainActivity.java
index b5b12d8..c7715ad 100644
--- a/tests/RenderThreadTest/src/com/example/renderthread/MainActivity.java
+++ b/tests/RenderThreadTest/src/com/example/renderthread/MainActivity.java
@@ -77,7 +77,8 @@
                     RenderNodeAnimator.TRANSLATION_Y, dy * delta);
             animator.setDuration(DURATION);
             if (child == clickedView) logTranslationY(clickedView);
-            animator.start(child);
+            animator.setTarget(child);
+            animator.start();
             if (child == clickedView) logTranslationY(clickedView);
         }
         //mHandler.postDelayed(mLaunchActivity, (long) (DURATION * .4));