summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2015-06-15 18:21:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-15 18:21:20 +0000
commitbe9c52fff17760dc83fd156bb0730a645e836aeb (patch)
treecb0dbdb641bc50698edda9d2d078f9d9145bf99a /src
parente863fed1400d00fab11a61c5b4b989d86ca55386 (diff)
parent5b139a5ca768a87e98bfbd547ecac5a10e1cf023 (diff)
downloadandroid_packages_apps_Trebuchet-be9c52fff17760dc83fd156bb0730a645e836aeb.tar.gz
android_packages_apps_Trebuchet-be9c52fff17760dc83fd156bb0730a645e836aeb.tar.bz2
android_packages_apps_Trebuchet-be9c52fff17760dc83fd156bb0730a645e836aeb.zip
Merge "Remove inifinite recursion from PagedView" into ub-launcher3-burnaby
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/PagedView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 4a85b448f..3d00034cc 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1045,7 +1045,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
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