Merge "Make ApiDemo build on Java 5.0"
This commit is contained in:
committed by
Android (Google) Code Review
commit
b76b6c5b61
@@ -58,13 +58,10 @@ public class AnimationLoading extends Activity {
|
||||
|
||||
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 ValueAnimator.AnimatorUpdateListener {
|
||||
|
||||
@@ -62,8 +62,6 @@ public class AnimationSeeking extends Activity {
|
||||
|
||||
Button starter = (Button) findViewById(R.id.startButton);
|
||||
starter.setOnClickListener(new View.OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
animView.startAnimation();
|
||||
}
|
||||
@@ -72,16 +70,12 @@ public class AnimationSeeking extends Activity {
|
||||
mSeekBar = (SeekBar) findViewById(R.id.seekBar);
|
||||
mSeekBar.setMax(DURATION);
|
||||
mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
|
||||
|
||||
@Override
|
||||
public void onStopTrackingTouch(SeekBar seekBar) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStartTrackingTouch(SeekBar seekBar) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onProgressChanged(SeekBar seekBar, int progress,
|
||||
boolean fromUser) {
|
||||
// prevent seeking on app creation
|
||||
@@ -162,21 +156,17 @@ public class AnimationSeeking extends Activity {
|
||||
//mSeekBar.setProgress((int)playtime);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAnimationCancel(Animator animation) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAnimationEnd(Animator animation) {
|
||||
balls.remove(((ObjectAnimator)animation).getTarget());
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAnimationRepeat(Animator animation) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAnimationStart(Animator animation) {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -183,21 +183,17 @@ public class BouncingBalls extends Activity {
|
||||
invalidate();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAnimationCancel(Animator animation) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAnimationEnd(Animator animation) {
|
||||
balls.remove(((ObjectAnimator)animation).getTarget());
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAnimationRepeat(Animator animation) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAnimationStart(Animator animation) {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,13 +50,10 @@ public class CustomEvaluator extends Activity {
|
||||
|
||||
Button starter = (Button) findViewById(R.id.startButton);
|
||||
starter.setOnClickListener(new View.OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
animView.startAnimation();
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
public class XYHolder {
|
||||
@@ -86,7 +83,6 @@ public class CustomEvaluator extends Activity {
|
||||
}
|
||||
|
||||
public class XYEvaluator implements TypeEvaluator {
|
||||
@Override
|
||||
public Object evaluate(float fraction, Object startValue, Object endValue) {
|
||||
XYHolder startXY = (XYHolder) startValue;
|
||||
XYHolder endXY = (XYHolder) endValue;
|
||||
|
||||
@@ -86,8 +86,6 @@ public class ListFlipper extends Activity {
|
||||
|
||||
Button starter = (Button) findViewById(R.id.button);
|
||||
starter.setOnClickListener(new View.OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
flipit();
|
||||
}
|
||||
|
||||
@@ -50,8 +50,6 @@ public class ReversingAnimation extends Activity {
|
||||
|
||||
Button starter = (Button) findViewById(R.id.startButton);
|
||||
starter.setOnClickListener(new View.OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
animView.startAnimation();
|
||||
}
|
||||
@@ -59,8 +57,6 @@ public class ReversingAnimation extends Activity {
|
||||
|
||||
Button reverser = (Button) findViewById(R.id.reverseButton);
|
||||
reverser.setOnClickListener(new View.OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
animView.reverseAnimation();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user