summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-10-04 17:50:20 -0700
committernicolasroard <nicolasroard@google.com>2012-10-04 17:50:20 -0700
commitf47e790e3f3553f69abe054eec20bd7585118843 (patch)
tree39fd28b3066ff8285af918bba2de95765bdbb02f
parentb559b2dd6637660ddbbdbae79a742c9f0fb1180b (diff)
downloadandroid_packages_apps_Gallery2-f47e790e3f3553f69abe054eec20bd7585118843.tar.gz
android_packages_apps_Gallery2-f47e790e3f3553f69abe054eec20bd7585118843.tar.bz2
android_packages_apps_Gallery2-f47e790e3f3553f69abe054eec20bd7585118843.zip
Add a reset item menu
bug:7234317 Change-Id: I3129b16f83981ab22ce17341d8401822369686eb
-rw-r--r--res/menu/filtershow_activity_menu.xml3
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java4
2 files changed, 7 insertions, 0 deletions
diff --git a/res/menu/filtershow_activity_menu.xml b/res/menu/filtershow_activity_menu.xml
index 8987e48e4..7cf446643 100644
--- a/res/menu/filtershow_activity_menu.xml
+++ b/res/menu/filtershow_activity_menu.xml
@@ -16,6 +16,9 @@
android:showAsAction="never"
android:title="@string/filtershow_redo"/>
<item
+ android:id="@+id/resetHistoryButton"
+ android:title="@string/reset"/>
+ <item
android:id="@+id/operationsButton"
android:icon="@drawable/filtershow_button_operations"
android:showAsAction="never"
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index d777b9f8b..964c950dc 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -313,6 +313,10 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
invalidateViews();
return true;
}
+ case R.id.resetHistoryButton: {
+ resetHistory();
+ return true;
+ }
case R.id.showImageStateButton: {
toggleImageStatePanel();
return true;