summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2013-07-18 16:37:30 -0700
committerRuben Brunk <rubenbrunk@google.com>2013-08-01 09:46:44 -0700
commitb0f7a8f7f7d95ae12e92f529fd9a8a37f75b105c (patch)
tree1033ee02b2d8f873f3ae1b00eddcc0f1c7219921 /src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
parent8f442fae60e0154867d2a6927eb9a35bcb7014e6 (diff)
downloadandroid_packages_apps_Gallery2-b0f7a8f7f7d95ae12e92f529fd9a8a37f75b105c.tar.gz
android_packages_apps_Gallery2-b0f7a8f7f7d95ae12e92f529fd9a8a37f75b105c.tar.bz2
android_packages_apps_Gallery2-b0f7a8f7f7d95ae12e92f529fd9a8a37f75b105c.zip
Refactoring Geometry handling.
Bug: 9170644 Bug: 9366654 Bug: 9366263 - Consolidates all the geometry transforms in GeometryMathUtils and significantly reduces complexity. - Removes GeometryMetadata object and dependent code. - Removes ImageGeometry and geometry update callbacks. Change-Id: I59add51907459593244c9ebaadef585efc7486d5
Diffstat (limited to 'src/com/android/gallery3d/filtershow/EditorPlaceHolder.java')
-rw-r--r--src/com/android/gallery3d/filtershow/EditorPlaceHolder.java33
1 files changed, 14 insertions, 19 deletions
diff --git a/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java b/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
index 7faa3d3ad..95abce114 100644
--- a/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
+++ b/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
@@ -44,26 +44,21 @@ public class EditorPlaceHolder {
return null;
}
- try {
- editor.createEditor(mActivity, mContainer);
- editor.getImageShow().bindAsImageLoadListener();
- mContainer.setVisibility(View.VISIBLE);
- mContainer.removeAllViews();
- 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;
- } catch (Exception e) {
- e.printStackTrace();
+ editor.createEditor(mActivity, mContainer);
+ editor.getImageShow().bindAsImageLoadListener();
+ mContainer.setVisibility(View.VISIBLE);
+ mContainer.removeAllViews();
+ View eview = editor.getTopLevelView();
+ ViewParent parent = eview.getParent();
+
+ if (parent != null && parent instanceof FrameLayout) {
+ ((FrameLayout) parent).removeAllViews();
}
- return null;
+
+ mContainer.addView(eview);
+ hideOldViews();
+ editor.setVisibility(View.VISIBLE);
+ return editor;
}
public void setOldViews(Vector<ImageShow> views) {