summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-03-06 21:05:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-06 21:05:05 +0000
commit8cfb75ad0f0c60e5115b1c0feb3d717ab4e4bfee (patch)
tree3b6d33a45536fd368af5e07833f5f21cb24bb3a8 /src/com
parent5b45e26674bcbb91bdc195bed15a897ba3b96b0e (diff)
parent8c500a4700889c62d5e9e1d457d73e3ea9ac3f59 (diff)
downloadandroid_packages_apps_Snap-8cfb75ad0f0c60e5115b1c0feb3d717ab4e4bfee.tar.gz
android_packages_apps_Snap-8cfb75ad0f0c60e5115b1c0feb3d717ab4e4bfee.tar.bz2
android_packages_apps_Snap-8cfb75ad0f0c60e5115b1c0feb3d717ab4e4bfee.zip
Merge "fix undo bug" into gb-ub-photos-bryce
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 4b5956530..33fdef5cc 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -700,6 +700,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.undoButton: {
+ mPanelController.resetParameters();
HistoryAdapter adapter = mMasterImage.getHistory();
int position = adapter.undo();
mMasterImage.onHistoryItemClick(position);