From 6120af1f6b886191f92a6780957ced8b500e467d Mon Sep 17 00:00:00 2001
From: Sascha Haeberling <haeberling@google.com>
Date: Wed, 8 May 2013 17:34:18 -0700
Subject: Make sure canceling a filter does not undo previous filter.

  Bug: 8770921

Change-Id: I2b8e5fac980f562eaf97b231ad15612004608164
---
 .../android/gallery3d/filtershow/HistoryAdapter.java | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'src/com')

diff --git a/src/com/android/gallery3d/filtershow/HistoryAdapter.java b/src/com/android/gallery3d/filtershow/HistoryAdapter.java
index 8d682465a..7fd6c849e 100644
--- a/src/com/android/gallery3d/filtershow/HistoryAdapter.java
+++ b/src/com/android/gallery3d/filtershow/HistoryAdapter.java
@@ -124,21 +124,8 @@ public class HistoryAdapter extends ArrayAdapter<ImagePreset> {
     }
 
     public void addHistoryItem(ImagePreset preset) {
-        if (canAddHistoryItem(preset)) {
-            insert(preset, 0);
-            updateMenuItems();
-        }
-    }
-
-    public boolean canAddHistoryItem(ImagePreset preset) {
-        if (getCount() > 0 && getCurrent().same(preset)) {
-            // we may still want to insert if the previous
-            // history element isn't the same
-            if (getLast().historyName().equalsIgnoreCase(preset.historyName())) {
-                return false;
-            }
-        }
-        return true;
+        insert(preset, 0);
+        updateMenuItems();
     }
 
     @Override
@@ -155,9 +142,6 @@ public class HistoryAdapter extends ArrayAdapter<ImagePreset> {
             }
             mCurrentPresetPosition = position;
             this.notifyDataSetChanged();
-            if (!canAddHistoryItem(preset)) {
-                return;
-            }
         }
         super.insert(preset, position);
         mCurrentPresetPosition = position;
-- 
cgit v1.2.3