diff options
Diffstat (limited to 'src')
5 files changed, 61 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index c7de01837..6275ae62d 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -64,6 +64,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilterCurves; import com.android.gallery3d.filtershow.filters.ImageFilterExposure; import com.android.gallery3d.filtershow.filters.ImageFilterFx; import com.android.gallery3d.filtershow.filters.ImageFilterHue; +import com.android.gallery3d.filtershow.filters.ImageFilterNegative; import com.android.gallery3d.filtershow.filters.ImageFilterParametricBorder; import com.android.gallery3d.filtershow.filters.ImageFilterRS; import com.android.gallery3d.filtershow.filters.ImageFilterSaturated; @@ -307,7 +308,8 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, new ImageFilterCurves(), new ImageFilterHue(), new ImageFilterSaturated(), - new ImageFilterBwFilter() + new ImageFilterBwFilter(), + new ImageFilterNegative() }; for (int i = 0; i < filters.length; i++) { diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index 4f59258ed..41833a668 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -32,6 +32,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilterContrast; import com.android.gallery3d.filtershow.filters.ImageFilterCurves; import com.android.gallery3d.filtershow.filters.ImageFilterExposure; import com.android.gallery3d.filtershow.filters.ImageFilterHue; +import com.android.gallery3d.filtershow.filters.ImageFilterNegative; import com.android.gallery3d.filtershow.filters.ImageFilterRedEye; import com.android.gallery3d.filtershow.filters.ImageFilterSaturated; import com.android.gallery3d.filtershow.filters.ImageFilterShadows; @@ -571,9 +572,9 @@ public class PanelController implements OnClickListener { if (view.getId() == R.id.curvesButtonRGB) { // TODO: delegate to the filter / editing view the management of the // panel accessory view - mUtilityPanel.setShowParameter(false); mUtilityPanel.showCurvesButtons(); } + mUtilityPanel.setShowParameter(filter.showParameterValue()); ensureFilter(ename); mCurrentImage.select(); } diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java index 8bd855660..2319fcc12 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java @@ -68,6 +68,10 @@ public class ImageFilter implements Cloneable { return true; } + public boolean showParameterValue() { + return true; + } + @Override public ImageFilter clone() throws CloneNotSupportedException { ImageFilter filter = (ImageFilter) super.clone(); diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java index 46a00f47a..ba49a8fcb 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java @@ -52,6 +52,11 @@ public class ImageFilterCurves extends ImageFilter { } @Override + public boolean showParameterValue() { + return false; + } + + @Override public ImageFilter clone() throws CloneNotSupportedException { ImageFilterCurves filter = (ImageFilterCurves) super.clone(); for (int i = 0; i < 4; i++) { diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java new file mode 100644 index 000000000..04fd1e42e --- /dev/null +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java @@ -0,0 +1,47 @@ +package com.android.gallery3d.filtershow.filters; + +import android.graphics.Bitmap; + +import com.android.gallery3d.R; + +public class ImageFilterNegative extends ImageFilter { + + public ImageFilterNegative() { + mName = "Negative"; + } + + @Override + public int getButtonId() { + return R.id.negativeButton; + } + + @Override + public int getTextId() { + return R.string.negative; + } + + @Override + public boolean isNil() { + return false; + } + + @Override + public boolean showEditingControls() { + return false; + } + + @Override + public boolean showParameterValue() { + return false; + } + + native protected void nativeApplyFilter(Bitmap bitmap, int w, int h); + + @Override + public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) { + int w = bitmap.getWidth(); + int h = bitmap.getHeight(); + nativeApplyFilter(bitmap, w, h); + return bitmap; + } +} |