commit 80444bfb55d40cd912ed46270ec070c6a2494c69
author Adam Cohen <adamcohen@google.com> Mon Jun 15 18:26:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 15 18:26:19 2015 +0000
tree 17b4da59393a08b49b0abf9b2421c2fc0ae3cc58
parent e01a3a9780a9ea346d1401ae2ac1469832ae50c7
parent be9c52fff17760dc83fd156bb0730a645e836aeb

am be9c52ff: Merge "Remove inifinite recursion from PagedView" into ub-launcher3-burnaby

* commit 'be9c52fff17760dc83fd156bb0730a645e836aeb':
  Remove inifinite recursion from PagedView

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 4a85b44..3d00034 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1045,7 +1045,7 @@
     public void removeViewAt(int index) {
         // XXX: We should find a better way to hook into this before the view
         // gets removed form its parent...
-        removeViewAt(index);
+        removeMarkerForView(index);
         super.removeViewAt(index);
     }
     @Override