summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-02 07:28:32 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-06-02 07:28:32 -0700
commit43abe820f2a46746dcd7b86db593c08b9e1f938d (patch)
tree67a0105873fe9c856b157ba192f1aee1279aac32 /samples
parent740c3e2e97a4cca24ecb534de72663ced238156a (diff)
parent38dcb296c95b7fd0ca597fca5a1fc904bfbbfa69 (diff)
downloadandroid_development-43abe820f2a46746dcd7b86db593c08b9e1f938d.tar.gz
android_development-43abe820f2a46746dcd7b86db593c08b9e1f938d.tar.bz2
android_development-43abe820f2a46746dcd7b86db593c08b9e1f938d.zip
merge from open-source master
Change-Id: I6e4280a7f664c84bdd5205db642ed0ae63bc5e3b
Diffstat (limited to 'samples')
-rw-r--r--samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java b/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java
index 38e69d031..a52b01ba3 100644
--- a/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java
+++ b/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java
@@ -101,7 +101,7 @@ public class Transition3d extends Activity implements
mContainer.startAnimation(rotation);
}
- public void onItemClick(AdapterView parent, View v, int position, long id) {
+ public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
// Pre-load the image then start the animation
mImageView.setImageResource(PHOTOS_RESOURCES[position]);
applyRotation(position, 0, 90);