From 7caa8cc9073e5cdf195c73f1eb0fe06df1efe569 Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Tue, 12 Feb 2013 16:32:43 -0800 Subject: Clean up red eye correction Change-Id: I19a8006ed31767ae8e33388cc5b11b5c68d5ae2d --- .../gallery3d/filtershow/FilterShowActivity.java | 6 --- .../gallery3d/filtershow/PanelController.java | 51 ---------------------- .../filters/FilterRedEyeRepresentation.java | 2 +- .../filtershow/filters/ImageFilterRedEye.java | 5 +-- 4 files changed, 2 insertions(+), 62 deletions(-) (limited to 'src') diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index e2d35801a..0660eda30 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -96,7 +96,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, private final PanelController mPanelController = new PanelController(); private ImageLoader mImageLoader = null; private ImageShow mImageShow = null; - private ImageRedEye mImageRedEye = null; private ImageDraw mImageDraw = null; private ImageStraighten mImageStraighten = null; private ImageCrop mImageCrop = null; @@ -199,7 +198,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mImageRotate = (ImageRotate) findViewById(R.id.imageRotate); mImageFlip = (ImageFlip) findViewById(R.id.imageFlip); mImageTinyPlanet = (ImageTinyPlanet) findViewById(R.id.imageTinyPlanet); - mImageRedEye = (ImageRedEye) findViewById(R.id.imageRedEyes); mImageDraw = (ImageDraw) findViewById(R.id.imageDraw); mImageCrop.setAspectTextSize((int) getPixelsFromDip(18)); @@ -211,7 +209,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mImageViews.add(mImageRotate); mImageViews.add(mImageFlip); mImageViews.add(mImageTinyPlanet); - mImageViews.add(mImageRedEye); mEditorPlaceHolder.setContainer((FrameLayout) findViewById(R.id.editorContainer)); mEditorPlaceHolder.addEditor(new EditorDraw()); @@ -252,7 +249,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mImageRotate.setImageLoader(mImageLoader); mImageFlip.setImageLoader(mImageLoader); mImageTinyPlanet.setImageLoader(mImageLoader); - mImageRedEye.setImageLoader(mImageLoader); mImageDraw.setImageLoader(mImageLoader); mPanelController.setActivity(this); @@ -264,7 +260,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mPanelController.addImageView(findViewById(R.id.imageRotate)); mPanelController.addImageView(findViewById(R.id.imageFlip)); mPanelController.addImageView(findViewById(R.id.imageTinyPlanet)); - mPanelController.addImageView(findViewById(R.id.imageRedEyes)); mPanelController.addImageView(findViewById(R.id.imageDraw)); mPanelController.addPanel(mFxButton, mListFx, 0); @@ -275,7 +270,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mPanelController.addComponent(mGeometryButton, findViewById(R.id.cropButton)); mPanelController.addComponent(mGeometryButton, findViewById(R.id.rotateButton)); mPanelController.addComponent(mGeometryButton, findViewById(R.id.flipButton)); - mPanelController.addComponent(mGeometryButton, findViewById(R.id.redEyeButton)); mPanelController.addPanel(mColorsButton, mListColors, 3); diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index 561ac6c81..45868eeba 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -445,49 +445,6 @@ public class PanelController implements OnClickListener { return MasterImage.getImage().getPreset(); } - /** - public ImageFilter setImagePreset(ImageFilter filter, String name) { - ImagePreset copy = new ImagePreset(getImagePreset()); - copy.add(filter); - copy.setHistoryName(name); - copy.setIsFx(false); - mMasterImage.setPreset(copy, true); - return filter; - } - */ - - // TODO: remove this. - public void ensureFilter(String name) { - /* - ImagePreset preset = getImagePreset(); - ImageFilter filter = preset.getFilter(name); - if (filter != null) { - // If we already have a filter, we might still want - // to push it onto the history stack. - ImagePreset copy = new ImagePreset(getImagePreset()); - copy.setHistoryName(name); - mMasterImage.setPreset(copy, true); - filter = copy.getFilter(name); - } - - if (filter == null) { - ImageFilter filterInstance = mFilters.get(name); - if (filterInstance != null) { - try { - ImageFilter newFilter = filterInstance.clone(); - newFilter.reset(); - filter = setImagePreset(newFilter, name); - } catch (CloneNotSupportedException e) { - e.printStackTrace(); - } - } - } - if (filter != null) { - mMasterImage.setCurrentFilter(filter); - } - */ - } - public void useFilterRepresentation(FilterRepresentation filterRepresentation) { if (filterRepresentation == null) { return; @@ -579,7 +536,6 @@ public class PanelController implements OnClickListener { mCurrentImage = showImageView(R.id.imageTinyPlanet).setShowControls(true); String ename = mCurrentImage.getContext().getString(R.string.tinyplanet); mUtilityPanel.setEffectName(ename); - ensureFilter(ename); if (!mDisableFilterButtons) { mActivity.disableFilterButtons(); mDisableFilterButtons = true; @@ -617,13 +573,6 @@ public class PanelController implements OnClickListener { mUtilityPanel.setShowParameter(false); break; } - case R.id.redEyeButton: { - mCurrentImage = showImageView(R.id.imageRedEyes).setShowControls(true); - String ename = mCurrentImage.getContext().getString(R.string.redeye); - mUtilityPanel.setEffectName(ename); - ensureFilter(ename); - break; - } case R.id.applyEffect: { if (MasterImage.getImage().getCurrentFilter() instanceof ImageFilterTinyPlanet) { mActivity.saveImage(); diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java index 2667cc8e9..329f5204e 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java @@ -32,9 +32,9 @@ public class FilterRedEyeRepresentation extends FilterRepresentation { super("RedEye"); setFilterClass(ImageFilterRedEye.class); setPriority(FilterRepresentation.TYPE_NORMAL); - setButtonId(R.id.redEyeButton); setTextId(R.string.redeye); setEditorId(EditorRedEye.ID); + setOverlayId(R.drawable.photoeditor_effect_redeye); } @Override diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java index 17e1427a6..5f5314946 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java @@ -35,10 +35,7 @@ public class ImageFilterRedEye extends ImageFilter { @Override public FilterRepresentation getDefaultRepresentation() { - FilterRedEyeRepresentation representation = new FilterRedEyeRepresentation(); - representation.setOverlayId(R.drawable.photoeditor_effect_redeye); - - return representation; + return new FilterRedEyeRepresentation(); } public boolean isNil() { -- cgit v1.2.3