Fix back button behaviour

bug:7290000
bug:7256201
Change-Id: Ia6f5726b0602c45e98566bcb5e027686e7f2fe57

1 files changed, 9 insertions, 6 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
index 93cde1fe5..4fc43a7c7 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
@@ -2,12 +2,6 @@
 package com.android.gallery3d.filtershow.filters;
 
 import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.util.Log;
-
-import com.android.gallery3d.R;
-
-import java.util.Arrays;
 
 public class ImageFilterFx extends ImageFilter {
     private static final String TAG = "ImageFilterFx";
@@ -26,8 +20,17 @@ public class ImageFilterFx extends ImageFilter {
         return filter;
     }
 
+    @Override
+    public boolean isNil() {
+        if (fxBitmap != null) {
+            return false;
+        }
+        return true;
+    }
+
     native protected void nativeApplyFilter(Bitmap bitmap, int w, int h,Bitmap  fxBitmap, int fxw, int fxh);
 
+    @Override
     public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) {
         if (fxBitmap==null)
             return bitmap;