commit be9c52fff17760dc83fd156bb0730a645e836aeb
author Adam Cohen <adamcohen@google.com> Mon Jun 15 18:21:20 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 15 18:21:20 2015 +0000
tree cb0dbdb641bc50698edda9d2d078f9d9145bf99a
parent e863fed1400d00fab11a61c5b4b989d86ca55386
parent 5b139a5ca768a87e98bfbd547ecac5a10e1cf023

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

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