Merge branch 'dev'

nhaarman · Oct 3, 2013 · 004bd24 · 004bd24
2 parents 32e7463 + 09877d6
commit 004bd24
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -71,7 +71,6 @@ example/.classpath
 example/.project
 example/proguard-project.txt
 */.classpath
-*.project
 *proguard-project.txt
 
 .gradle/
diff --git a/example/project.properties b/example/project.properties
@@ -13,4 +13,4 @@
 # Project target.
 target=Google Inc.:Google APIs:18
 android.library.reference.1=..\\library
-android.library.reference.2=../../../../../Program Files (x86)/Android SDK/extras/android/support/v7/appcompat
+android.library.reference.2=../../android-support-v7-appcompat
diff --git a/library/.project b/library/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Library-ListViewAnimations</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/library/project.properties b/library/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=Google Inc.:Google APIs:18
+target=android-18
 android.library=true
diff --git a/library/src/com/haarman/listviewanimations/ArrayAdapter.java b/library/src/com/haarman/listviewanimations/ArrayAdapter.java
@@ -69,6 +69,7 @@ public long getItemId(int position) {
 	/**
 	 * Appends the specified element to the end of the list.
 	 */
+	// @ requires item != null;
 	public void add(T item) {
 		mItems.add(item);
 		notifyDataSetChanged();

diff --git a/...stviewanimations/itemmanipulation/contextualundo/ContextualUndoListViewTouchListener.java b/...stviewanimations/itemmanipulation/contextualundo/ContextualUndoListViewTouchListener.java
@@ -204,6 +204,7 @@ public void onAnimationEnd(Animator animation) {
 				MotionEvent cancelEvent = MotionEvent.obtain(motionEvent);
 				cancelEvent.setAction(MotionEvent.ACTION_CANCEL | (motionEvent.getActionIndex() << MotionEvent.ACTION_POINTER_INDEX_SHIFT));
 				mListView.onTouchEvent(cancelEvent);
+				cancelEvent.recycle();
 			}
 
 			if (mSwiping) {