Merge "Fix build" (a76a150f) · Commits · e / os / android_frameworks_base

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -108,7 +108,6 @@ public class CirclePropActivity extends Activity {

		mToggle = !mToggle;

		/*
		mRunningAnimations.add(new RenderNodeAnimator(
		mX, mToggle ? 400.0f : 200.0f));

		@@ -131,7 +130,8 @@ public class CirclePropActivity extends Activity {
		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 @@ public class CirclePropActivity extends Activity {
		}
		});
		}
		*/
		return true;
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,8 @@ public class MainActivity extends Activity implements OnItemClickListener {
		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));