summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/drawable/filtershow_button_colors_snapseed.pngbin0 -> 7206 bytes
-rw-r--r--res/values/filtershow_ids.xml1
-rw-r--r--res/values/filtershow_strings.xml2
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java2
-rw-r--r--src_pd/com/android/gallery3d/filtershow/filters/ImageFilterDrama.java71
5 files changed, 76 insertions, 0 deletions
diff --git a/res/drawable/filtershow_button_colors_snapseed.png b/res/drawable/filtershow_button_colors_snapseed.png
new file mode 100644
index 000000000..3ceef4fd8
--- /dev/null
+++ b/res/drawable/filtershow_button_colors_snapseed.png
Binary files differ
diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml
index 0a9468951..85699728d 100644
--- a/res/values/filtershow_ids.xml
+++ b/res/values/filtershow_ids.xml
@@ -29,6 +29,7 @@
<item type="id" name="exposureButton" />
<item type="id" name="shadowRecoveryButton" />
<item type="id" name="sharpenButton" />
+ <item type="id" name="dramaButton" />
<item type="id" name="curvesButtonRGB" />
<item type="id" name="negativeButton" />
<item type="id" name="edgeButton" />
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 7f96824be..d19c15ab3 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -103,6 +103,8 @@
<string name="exposure" msgid="1229093066434614811">Exposure</string>
<!-- Label for the image sharpness (clarity, distinctness) filter button [CHAR LIMIT=10] -->
<string name="sharpness">Sharpness</string>
+ <!-- Label for the image Drama (striking, sensational) filter button [CHAR LIMIT=10] -->
+ <string name="drama">Drama</string>
<!-- Label for the image contrast (color difference) filter button [CHAR LIMIT=10] -->
<string name="contrast">Contrast</string>
<!-- Label for the image vibrance (strengthens colors) filter button [CHAR LIMIT=10] -->
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 755bd8031..fc4929ef5 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -62,6 +62,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilterBwFilter;
import com.android.gallery3d.filtershow.filters.ImageFilterContrast;
import com.android.gallery3d.filtershow.filters.ImageFilterCurves;
import com.android.gallery3d.filtershow.filters.ImageFilterDownsample;
+import com.android.gallery3d.filtershow.filters.ImageFilterDrama;
import com.android.gallery3d.filtershow.filters.ImageFilterDraw;
import com.android.gallery3d.filtershow.filters.ImageFilterEdge;
import com.android.gallery3d.filtershow.filters.ImageFilterExposure;
@@ -322,6 +323,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
new ImageFilterShadows(),
new ImageFilterVibrance(),
new ImageFilterSharpen(),
+ new ImageFilterDrama(),
new ImageFilterCurves(),
new ImageFilterDraw(),
new ImageFilterHue(),
diff --git a/src_pd/com/android/gallery3d/filtershow/filters/ImageFilterDrama.java b/src_pd/com/android/gallery3d/filtershow/filters/ImageFilterDrama.java
new file mode 100644
index 000000000..a44d4af3e
--- /dev/null
+++ b/src_pd/com/android/gallery3d/filtershow/filters/ImageFilterDrama.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gallery3d.filtershow.filters;
+
+import java.lang.Math;
+
+import android.app.Activity;
+import android.graphics.Bitmap;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.Script;
+import android.renderscript.ScriptC;
+import android.renderscript.Type;
+import android.util.Log;
+
+import com.android.gallery3d.R;
+
+public class ImageFilterDrama extends ImageFilterRS {
+
+ private static final String LOGTAG = "ImageFilterDrama";
+
+ public ImageFilterDrama() {
+ mName = "Drama";
+ mMinParameter = 0;
+ }
+
+ @Override
+ public int getButtonId() {
+ return R.id.dramaButton;
+ }
+
+ @Override
+ public int getTextId() {
+ return R.string.drama;
+ }
+
+ @Override
+ public int getOverlayBitmaps() {
+ return R.drawable.filtershow_button_colors_snapseed;
+ }
+
+ @Override
+ public int getEditingViewId() {
+ return R.id.imageZoom;
+ }
+
+ @Override
+ public void createFilter(android.content.res.Resources res, float scaleFactor,
+ boolean highQuality) {
+ }
+
+ @Override
+ public void runFilter() {
+ }
+
+}