am d7351228: am 0a23daac: am 166ebd4d: De-parent custom content view before adding to custom content screen

* commit 'd735122857231d3e6e74e516f2de5fa101b14d7e': De-parent custom content view before adding to custom content screen
2014-02-14 20:54:07 +00:00
parent 53b995f00c d735122857
commit 0008ff9b36
1 changed files with 6 additions and 0 deletions
@@ -619,6 +619,12 @@ public class Workspace extends SmoothPagedView
        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;