commit 286afab10fb4c528ea503981c4f1bdbcfbdbde77
author Ruben Brunk <rubenbrunk@google.com> Mon May 20 21:22:09 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 20 21:22:09 2013 +0000
tree 7e617e0818524f9dec8444de02fbd3b374238efd
parent 7af7156a809934951877b1f9b9ad1ceeb9c9a5ce
parent f6be3f0d8968383cfa7e76ef2d480fdfadcc9b7f

Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce

src/com/android/gallery3d/filtershow/HistoryAdapter.java

diff --git a/src/com/android/gallery3d/filtershow/HistoryAdapter.java b/src/com/android/gallery3d/filtershow/HistoryAdapter.java
index 1d47160..79460be 100644
--- a/src/com/android/gallery3d/filtershow/HistoryAdapter.java
+++ b/src/com/android/gallery3d/filtershow/HistoryAdapter.java
@@ -133,21 +133,8 @@
     }
 
     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
@@ -164,9 +151,6 @@
             }
             mCurrentPresetPosition = position;
             this.notifyDataSetChanged();
-            if (!canAddHistoryItem(preset)) {
-                return;
-            }
         }
         super.insert(preset, position);
         mCurrentPresetPosition = position;