summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-04-18 18:43:29 -0700
committerJohn Hoford <hoford@google.com>2013-04-19 15:26:53 -0700
commit55afc2dcadf2f88774fbbe2eb7b11a5639b9fa29 (patch)
tree335ed4e00219d5cb86ce19fc45a5d38f603d4b4b /src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
parent8d732159c1093e7ce970cb34bc6d36a14f26e3fa (diff)
downloadandroid_packages_apps_Snap-55afc2dcadf2f88774fbbe2eb7b11a5639b9fa29.tar.gz
android_packages_apps_Snap-55afc2dcadf2f88774fbbe2eb7b11a5639b9fa29.tar.bz2
android_packages_apps_Snap-55afc2dcadf2f88774fbbe2eb7b11a5639b9fa29.zip
tiny planet fix
bug:8323524 Change-Id: I39283face7079574dbe25e797323a84141930f9a
Diffstat (limited to 'src/com/android/gallery3d/filtershow/EditorPlaceHolder.java')
-rw-r--r--src/com/android/gallery3d/filtershow/EditorPlaceHolder.java10
1 files changed, 9 insertions, 1 deletions
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;