Fix flashing in geometry panel

bug:7406402
Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a

diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 8943f30..2522c89 100644 (file)
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -181,7 +181,7 @@ public class ImagePreset {
             return false;
         }
 
-        if (mImageBorder != preset.mImageBorder) {
+        if (mDoApplyGeometry && mImageBorder != preset.mImageBorder) {
             return false;
         }
 
@@ -292,7 +292,7 @@ public class ImagePreset {
             }
         }
 
-        if (mImageBorder != null) {
+        if (mImageBorder != null && mDoApplyGeometry) {
             bitmap = mImageBorder.apply(bitmap, mScaleFactor, mIsHighQuality);
         }