commit 166ebd4da5d85195bd1f562572f468726ade548f
author Adam Cohen <adamcohen@google.com> Tue Nov 26 14:55:45 2013 -0800
committer Adam Cohen <adamcohen@google.com> Tue Nov 26 14:56:18 2013 -0800
tree 9833e28f7d8c4b383627000e9cdade60aea431cc
parent d552dd90f1da32e1be2dd95ffed57c65d40cb651

De-parent custom content view before adding to custom content screen

Bug: 11666352
Change-Id: Ief35e6e8a16ec0217e0dd27434723ee7a7d5beef

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index b1b50bf..02949e7 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -619,6 +619,12 @@
         if (customContent instanceof Insettable) {
             ((Insettable)customContent).setInsets(mInsets);
         }
+
+        // Verify that the child is removed from any existing parent.
+        if (customContent.getParent() instanceof ViewGroup) {
+            ViewGroup parent = (ViewGroup) customContent.getParent();
+            parent.removeView(customContent);
+        }
         customScreen.removeAllViews();
         customScreen.addViewToCellLayout(customContent, 0, 0, lp, true);
         mCustomContentDescription = description;