am 67fefdb9: add support for black and white filters, add rotation API to tiny planet

* commit '67fefdb9b77644c955e1c0c5b1fcd51e2374f212':
  add support for black and white filters, add rotation API to tiny planet

4 files changed, 71 insertions, 2 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 8bae88cad..9db4d733b 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -55,6 +55,7 @@ import com.android.gallery3d.data.LocalAlbum;
 import com.android.gallery3d.filtershow.cache.ImageLoader;
 import com.android.gallery3d.filtershow.filters.ImageFilter;
 import com.android.gallery3d.filtershow.filters.ImageFilterBorder;
+import com.android.gallery3d.filtershow.filters.ImageFilterBwFilter;
 import com.android.gallery3d.filtershow.filters.ImageFilterContrast;
 import com.android.gallery3d.filtershow.filters.ImageFilterExposure;
 import com.android.gallery3d.filtershow.filters.ImageFilterFx;
@@ -255,6 +256,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
                 R.id.vibranceButton,
                 R.id.contrastButton,
                 R.id.saturationButton,
+                R.id.bwfilterButton,
                 R.id.wbalanceButton,
                 R.id.hueButton,
                 R.id.exposureButton,
@@ -266,6 +268,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
                 new ImageFilterVibrance(),
                 new ImageFilterContrast(),
                 new ImageFilterSaturated(),
+                new ImageFilterBwFilter(),
                 new ImageFilterWBalance(),
                 new ImageFilterHue(),
                 new ImageFilterExposure(),
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 9fc1109cb..2bf95e759 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -27,6 +27,7 @@ import android.widget.TextView;
 
 import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.filters.ImageFilter;
+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.ImageFilterExposure;
@@ -548,6 +549,10 @@ public class PanelController implements OnClickListener {
             filter = setImagePreset(new ImageFilterSaturated(), name);
         }
         if (filter == null
+                && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.bwfilter))) {
+            filter = setImagePreset(new ImageFilterBwFilter(), name);
+        }
+        if (filter == null
                 && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.hue))) {
             filter = setImagePreset(new ImageFilterHue(), name);
         }
@@ -704,6 +709,13 @@ public class PanelController implements OnClickListener {
                 ensureFilter(ename);
                 break;
             }
+            case R.id.bwfilterButton: {
+            mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
+            String ename = mCurrentImage.getContext().getString(R.string.bwfilter);
+            mUtilityPanel.setEffectName(ename);
+            ensureFilter(ename);
+            break;
+        }
             case R.id.wbalanceButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(false);
                 String ename = mCurrentImage.getContext().getString(R.string.wbalance);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
new file mode 100644
index 000000000..558abe3c3
--- /dev/null
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2012 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 android.graphics.Bitmap;
+import android.graphics.Color;
+
+
+public class ImageFilterBwFilter extends ImageFilter {
+
+    public ImageFilterBwFilter() {
+        mName = "BW Filter";
+        mMaxParameter = 180;
+        mMinParameter = -180;
+    }
+
+    @Override
+    public ImageFilter clone() throws CloneNotSupportedException {
+        ImageFilterBwFilter filter = (ImageFilterBwFilter) super.clone();
+        return filter;
+    }
+
+    native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, int r, int g, int b);
+
+    @Override
+    public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) {
+        int w = bitmap.getWidth();
+        int h = bitmap.getHeight();
+        float[] hsv = new float[] {
+                180 + mParameter, 1, 1
+        };
+        int rgb = Color.HSVToColor(hsv);
+        int r = 0xFF & (rgb >> 16);
+        int g = 0xFF & (rgb >> 8);
+        int b = 0xFF & (rgb >> 0);
+        nativeApplyFilter(bitmap, w, h, r, g, b);
+        return bitmap;
+    }
+}
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
index ccf0dc951..1dc173123 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
@@ -38,7 +38,8 @@ public class ImageFilterTinyPlanet extends ImageFilter {
     }
 
     native protected void nativeApplyFilter(
-            Bitmap bitmapIn, int width, int height, Bitmap bitmapOut, int outSize, float scale);
+            Bitmap bitmapIn, int width, int height, Bitmap bitmapOut, int outSize, float scale,
+            float angle);
 
     @Override
     public Bitmap apply(Bitmap bitmapIn, float scaleFactor, boolean highQuality) {
@@ -61,7 +62,7 @@ public class ImageFilterTinyPlanet extends ImageFilter {
                 outputSize, outputSize, Bitmap.Config.ARGB_8888);
 
         // TODO(haeberling): Add the padding back in based on the meta-data.
-        nativeApplyFilter(bitmapIn, w, h, mBitmapOut, outputSize, mParameter / 100f);
+        nativeApplyFilter(bitmapIn, w, h, mBitmapOut, outputSize, mParameter / 100f, 0f);
         return mBitmapOut;
     }
 }