summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-02 07:31:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-02 07:31:14 -0700
commit0f57228bd3fa8b3ab5e768b24c32cec327afbf0f (patch)
tree646abf042d37f72e9874cd3642900cb06703a7ae /samples
parent74a0b220620c4d328ff05fc6f8c7ce64e00d7091 (diff)
parent43abe820f2a46746dcd7b86db593c08b9e1f938d (diff)
downloadandroid_development-0f57228bd3fa8b3ab5e768b24c32cec327afbf0f.tar.gz
android_development-0f57228bd3fa8b3ab5e768b24c32cec327afbf0f.tar.bz2
android_development-0f57228bd3fa8b3ab5e768b24c32cec327afbf0f.zip
am 43abe820: merge from open-source master
Merge commit '43abe820f2a46746dcd7b86db593c08b9e1f938d' into kraken * commit '43abe820f2a46746dcd7b86db593c08b9e1f938d': Reduced Warnings
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);