LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Make ApiDemo build on Java 5.0"

Browse Source
This commit is contained in:
Xavier Ducrohet
2010-11-03 18:20:35 -07:00
committed by Android (Google) Code Review
parent df5ab89e0b 0bb93262cc
commit b76b6c5b61
11 changed files with 7 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/ApiDemos/src/com/example/android/apis/animation/AnimationLoading.java
View File

@@ -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 {

10
samples/ApiDemos/src/com/example/android/apis/animation/AnimationSeeking.java
View File

@@ -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) {
}
}

4
samples/ApiDemos/src/com/example/android/apis/animation/BouncingBalls.java
View File

@@ -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) {
}
}

4
samples/ApiDemos/src/com/example/android/apis/animation/CustomEvaluator.java
View File

@@ -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;

2
samples/ApiDemos/src/com/example/android/apis/animation/ListFlipper.java
View File

@@ -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();
}

4
samples/ApiDemos/src/com/example/android/apis/animation/ReversingAnimation.java
View File

@@ -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();
}

4
samples/ApiDemos/src/com/example/android/apis/app/ActionBarDisplayOptions.java
View File

@@ -64,7 +64,6 @@ public class ActionBarDisplayOptions extends Activity
return true;
}
@Override
public void onClick(View v) {
final ActionBar bar = getActionBar();
int flags = 0;
@@ -114,15 +113,12 @@ public class ActionBarDisplayOptions extends Activity
bar.setDisplayOptions(change, flags);
}
@Override
public void onTabSelected(Tab tab, FragmentTransaction ft) {
}
@Override
public void onTabUnselected(Tab tab, FragmentTransaction ft) {
}
@Override
public void onTabReselected(Tab tab, FragmentTransaction ft) {
}
}

2
samples/ApiDemos/src/com/example/android/apis/app/FragmentListCursorLoader.java
View File

@@ -107,7 +107,6 @@ public class FragmentListCursorLoader extends Activity {
Contacts.LOOKUP_KEY,
};
@Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
String select = "((" + Contacts.DISPLAY_NAME + " NOTNULL) AND ("
+ Contacts.HAS_PHONE_NUMBER + "=1) AND ("
@@ -117,7 +116,6 @@ public class FragmentListCursorLoader extends Activity {
Contacts.DISPLAY_NAME + " COLLATE LOCALIZED ASC");
}
@Override
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
ListAdapter adapter = new SimpleCursorAdapter(getActivity(),
android.R.layout.simple_list_item_2, data,

1
samples/ApiDemos/src/com/example/android/apis/content/ClipboardSample.java
View File

@@ -46,7 +46,6 @@ public class ClipboardSample extends Activity {
ClipboardManager.OnPrimaryClipChangedListener mPrimaryChangeListener
= new ClipboardManager.OnPrimaryClipChangedListener() {
@Override
public void onPrimaryClipChanged() {
updateClipData();
}

22
samples/ApiDemos/src/com/example/android/apis/view/RotatingButton.java
View File

@@ -42,16 +42,12 @@ public class RotatingButton extends Activity {
seekBar = (SeekBar) findViewById(R.id.translationX);
seekBar.setMax(400);
seekBar.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) {
rotatingButton.setTranslationX((float)progress);
@@ -61,15 +57,12 @@ public class RotatingButton extends Activity {
seekBar.setMax(800);
seekBar.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) {
rotatingButton.setTranslationY((float)progress);
@@ -80,15 +73,12 @@ public class RotatingButton extends Activity {
seekBar.setProgress(10);
seekBar.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) {
rotatingButton.setScaleX((float)progress/10f);
@@ -99,15 +89,12 @@ public class RotatingButton extends Activity {
seekBar.setProgress(10);
seekBar.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) {
rotatingButton.setScaleY((float)progress/10f);
@@ -117,15 +104,12 @@ public class RotatingButton extends Activity {
seekBar.setMax(360);
seekBar.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
@@ -136,15 +120,12 @@ public class RotatingButton extends Activity {
seekBar.setMax(360);
seekBar.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
@@ -155,15 +136,12 @@ public class RotatingButton extends Activity {
seekBar.setMax(360);
seekBar.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

2
samples/ApiDemos/src/com/example/android/apis/view/SplitTouchView.java
View File

@@ -20,7 +20,6 @@ import com.example.android.apis.R;
import android.app.Activity;
import android.os.Bundle;
import android.view.Gravity;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
@@ -53,7 +52,6 @@ public class SplitTouchView extends Activity {
private int responseIndex = 0;
private final OnItemClickListener itemClickListener = new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
String[] responses = getResources().getStringArray(R.array.cheese_responses);
String response = responses[responseIndex++ % responses.length];