From 55afc2dcadf2f88774fbbe2eb7b11a5639b9fa29 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Thu, 18 Apr 2013 18:43:29 -0700
Subject: tiny planet fix

bug:8323524
Change-Id: I39283face7079574dbe25e797323a84141930f9a
---
 src/com/android/gallery3d/filtershow/EditorPlaceHolder.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/com/android/gallery3d/filtershow/EditorPlaceHolder.java')

diff --git a/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java b/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
index 735803c71..38424ec1f 100644
--- a/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
+++ b/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
@@ -1,6 +1,7 @@
 package com.android.gallery3d.filtershow;
 
 import android.view.View;
+import android.view.ViewParent;
 import android.widget.FrameLayout;
 
 import com.android.gallery3d.filtershow.cache.ImageLoader;
@@ -49,7 +50,14 @@ public class EditorPlaceHolder {
             editor.setImageLoader(mImageLoader);
             mContainer.setVisibility(View.VISIBLE);
             mContainer.removeAllViews();
-            mContainer.addView(editor.getTopLevelView());
+            View eview = editor.getTopLevelView();
+            ViewParent parent = eview.getParent();
+
+            if (parent != null && parent instanceof FrameLayout) {
+                ((FrameLayout) parent).removeAllViews();
+            }
+
+            mContainer.addView(eview);
             hideOldViews();
             editor.setVisibility(View.VISIBLE);
             return editor;
-- 
cgit v1.2.3