Latest UI

bug:7233983
bug:7233980

Also fixes border scaling issues.

Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5

6 files changed, 21 insertions, 9 deletions

diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index a7b4b4090..ec0ed7402 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -153,15 +153,15 @@ public class ImagePreset {
         // First we apply any transform -- 90 rotate, flip, straighten, crop
         Bitmap bitmap = mGeoData.apply(original, mScaleFactor, mIsHighQuality);
 
-        if (mImageBorder != null) {
-            bitmap = mImageBorder.apply(bitmap, mScaleFactor, mIsHighQuality);
-        }
-
         for (int i = 0; i < mFilters.size(); i++) {
             ImageFilter filter = mFilters.elementAt(i);
             bitmap = filter.apply(bitmap, mScaleFactor, mIsHighQuality);
         }
 
+        if (mImageBorder != null) {
+            bitmap = mImageBorder.apply(bitmap, mScaleFactor, mIsHighQuality);
+        }
+
         if (mEndPoint != null) {
             mEndPoint.updateFilteredImage(bitmap);
         }
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePresetBW.java b/src/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
index a270080f9..f5eeb78fd 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
@@ -5,10 +5,12 @@ import com.android.gallery3d.filtershow.filters.ImageFilterBW;
 
 public class ImagePresetBW extends ImagePreset {
 
+    @Override
     public String name() {
-        return "Black & White";
+        return "B&W";
     }
 
+    @Override
     public void setup() {
         mFilters.add(new ImageFilterBW());
     }
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java b/src/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
index 1783b482b..97d21e1e6 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
@@ -5,10 +5,12 @@ import com.android.gallery3d.filtershow.filters.ImageFilterBWBlue;
 
 public class ImagePresetBWBlue extends ImagePreset {
 
+    @Override
     public String name() {
-        return "Black & White (Blue)";
+        return "B&W - Blue";
     }
 
+    @Override
     public void setup() {
         mFilters.add(new ImageFilterBWBlue());
     }
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java b/src/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
index 5b317a1e0..26588b9ac 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
@@ -5,10 +5,12 @@ import com.android.gallery3d.filtershow.filters.ImageFilterBWGreen;
 
 public class ImagePresetBWGreen extends ImagePreset {
 
+    @Override
     public String name() {
-        return "Black & White (Green)";
+        return "B&W - Green";
     }
 
+    @Override
     public void setup() {
         mFilters.add(new ImageFilterBWGreen());
     }
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java b/src/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
index 7b9f0e141..299621edf 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
@@ -5,10 +5,12 @@ import com.android.gallery3d.filtershow.filters.ImageFilterBWRed;
 
 public class ImagePresetBWRed extends ImagePreset {
 
+    @Override
     public String name() {
-        return "Black & White (Red)";
+        return "B&W - Red";
     }
 
+    @Override
     public void setup() {
         mFilters.add(new ImageFilterBWRed());
     }
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java b/src/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
index cf280ee47..1a84bbf5d 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
@@ -5,12 +5,16 @@ import com.android.gallery3d.filtershow.filters.ImageFilterSaturated;
 
 public class ImagePresetSaturated extends ImagePreset {
 
+    @Override
     public String name() {
         return "Saturated";
     }
 
+    @Override
     public void setup() {
-        mFilters.add(new ImageFilterSaturated());
+        ImageFilterSaturated filter = new ImageFilterSaturated();
+        filter.setParameter(50);
+        mFilters.add(filter);
     }
 
 }