Merge pull request #5292 from salachi/TIMOB-16166

TIMOB-16166-Detach the view from the existing parent before adding
tidev · Jan 30, 2014 · 7f35532 · 7f35532
2 parents f863a8f + 1cf8b6c
commit 7f35532
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/android/modules/media/src/java/ti/modules/titanium/media/TiCameraActivity.java b/android/modules/media/src/java/ti/modules/titanium/media/TiCameraActivity.java
@@ -40,6 +40,8 @@
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
 
@@ -204,8 +206,13 @@ protected void onResume()
 		cameraActivity = this;
 		previewLayout.addView(preview, new FrameLayout.LayoutParams(
 				LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
-		cameraLayout.addView(localOverlayProxy.getOrCreateView()
-				.getNativeView(), new FrameLayout.LayoutParams(
+		View overlayView = localOverlayProxy.getOrCreateView().getNativeView();
+		ViewGroup parent = (ViewGroup) overlayView.getParent();
+		// Detach from the parent if applicable
+		if (parent != null) {
+			parent.removeView(overlayView);
+		}
+		cameraLayout.addView(overlayView, new FrameLayout.LayoutParams(
 				LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
 	}