Latest UI
bug:7233983
bug:7233980
Also fixes border scaling issues.
Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 7915371..178f18a 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -177,7 +177,7 @@
android:id="@+id/filterButtonsList"
android:layout_width="fill_parent"
android:layout_height="96dip"
- android:background="@color/background_toolbar"
+ android:background="@color/background_main_toolbar"
android:orientation="horizontal"
android:visibility="gone" >
@@ -239,7 +239,7 @@
android:id="@+id/geometryList"
android:layout_width="fill_parent"
android:layout_height="96dip"
- android:background="@color/background_toolbar"
+ android:background="@color/background_main_toolbar"
android:visibility="gone" >
<LinearLayout
@@ -284,7 +284,7 @@
android:id="@+id/colorsFxList"
android:layout_width="fill_parent"
android:layout_height="96dip"
- android:background="@color/background_toolbar"
+ android:background="@color/background_main_toolbar"
android:visibility="gone" >
<LinearLayout
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index a7b4b40..ec0ed74 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -153,15 +153,15 @@
// 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 a270080..f5eeb78 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
@@ -5,10 +5,12 @@
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 1783b48..97d21e1 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
@@ -5,10 +5,12 @@
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 5b317a1..26588b9 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
@@ -5,10 +5,12 @@
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 7b9f0e1..299621e 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
@@ -5,10 +5,12 @@
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 cf280ee..1a84bbf 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
@@ -5,12 +5,16 @@
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);
}
}