diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-05-08 17:34:18 -0700 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2013-05-08 17:34:18 -0700 |
commit | 6120af1f6b886191f92a6780957ced8b500e467d (patch) | |
tree | 861221103cdbe493ac368775eefb709afb1bc013 /src/com | |
parent | ca1717423fadab46d9c9d2f967a1a1d7eb2473ab (diff) | |
download | android_packages_apps_Snap-6120af1f6b886191f92a6780957ced8b500e467d.tar.gz android_packages_apps_Snap-6120af1f6b886191f92a6780957ced8b500e467d.tar.bz2 android_packages_apps_Snap-6120af1f6b886191f92a6780957ced8b500e467d.zip |
Make sure canceling a filter does not undo previous filter.
Bug: 8770921
Change-Id: I2b8e5fac980f562eaf97b231ad15612004608164
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/gallery3d/filtershow/HistoryAdapter.java | 20 |
1 files changed, 2 insertions, 18 deletions
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; |