Fix undo/redo/back button behaviour with effects and enable history

bug:7332980
bug:7357734
bug:7325872
Change-Id: Ie952a410c218c91ac927095ddcf542209fe7b90c

diff --git a/res/drawable-hdpi/camera_crop.png b/res/drawable-hdpi/camera_crop.png
new file mode 100644 (file)
index 0000000..97b1b98
Binary files /dev/null and b/res/drawable-hdpi/camera_crop.png differ

diff --git a/res/drawable-mdpi/camera_crop.png b/res/drawable-mdpi/camera_crop.png
new file mode 100644 (file)
index 0000000..cf38564
Binary files /dev/null and b/res/drawable-mdpi/camera_crop.png differ

diff --git a/res/drawable-xhdpi/camera_crop.png b/res/drawable-xhdpi/camera_crop.png
new file mode 100644 (file)
index 0000000..e0a53bc
Binary files /dev/null and b/res/drawable-xhdpi/camera_crop.png differ

diff --git a/res/layout/filtershow_history_operation_row.xml b/res/layout/filtershow_history_operation_row.xml
index 6f9ea1b..dd9b66e 100644 (file)
--- a/res/layout/filtershow_history_operation_row.xml
+++ b/res/layout/filtershow_history_operation_row.xml
@@ -23,7 +23,7 @@
 
     <ImageView
         android:id="@+id/selectedMark"
-        android:src="@drawable/filtershow_button_current"
+        android:src="@drawable/camera_crop"
         android:background="@android:color/transparent"
         android:layout_width="32dip"
         android:layout_height="match_parent"

diff --git a/res/menu/filtershow_activity_menu.xml b/res/menu/filtershow_activity_menu.xml
index 34d5c7b..efb8747 100644 (file)
--- a/res/menu/filtershow_activity_menu.xml
+++ b/res/menu/filtershow_activity_menu.xml
@@ -22,7 +22,7 @@
         android:id="@+id/operationsButton"
         android:icon="@drawable/filtershow_button_operations"
         android:showAsAction="never"
-        android:visible="false"
+        android:visible="true"
         android:title="@string/show_history_panel"/>
     <item
         android:id="@+id/showImageStateButton"