diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-10-17 17:46:47 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2012-10-18 17:05:58 -0700 |
| commit | ee5ec4eb100800d680be961395a04566f561ee41 (patch) | |
| tree | f5be04ba1bac9e696354f4c7bebda5a0879242d0 | |
| parent | 5181cd2335c3ea1998933a94e318ec68b0aa3f12 (diff) | |
| download | android_packages_apps_Snap-ee5ec4eb100800d680be961395a04566f561ee41.tar.gz android_packages_apps_Snap-ee5ec4eb100800d680be961395a04566f561ee41.tar.bz2 android_packages_apps_Snap-ee5ec4eb100800d680be961395a04566f561ee41.zip | |
Fix undo/redo/back button behaviour with effects and enable history
bug:7332980
bug:7357734
bug:7325872
Change-Id: Ie952a410c218c91ac927095ddcf542209fe7b90c
| -rw-r--r-- | res/drawable-hdpi/camera_crop.png | bin | 0 -> 1662 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/camera_crop.png | bin | 0 -> 1093 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/camera_crop.png | bin | 0 -> 2400 bytes | |||
| -rw-r--r-- | res/layout/filtershow_history_operation_row.xml | 2 | ||||
| -rw-r--r-- | res/menu/filtershow_activity_menu.xml | 2 |
5 files changed, 2 insertions, 2 deletions
diff --git a/res/drawable-hdpi/camera_crop.png b/res/drawable-hdpi/camera_crop.png Binary files differnew file mode 100644 index 000000000..97b1b989e --- /dev/null +++ b/res/drawable-hdpi/camera_crop.png diff --git a/res/drawable-mdpi/camera_crop.png b/res/drawable-mdpi/camera_crop.png Binary files differnew file mode 100644 index 000000000..cf385641c --- /dev/null +++ b/res/drawable-mdpi/camera_crop.png diff --git a/res/drawable-xhdpi/camera_crop.png b/res/drawable-xhdpi/camera_crop.png Binary files differnew file mode 100644 index 000000000..e0a53bcc9 --- /dev/null +++ b/res/drawable-xhdpi/camera_crop.png diff --git a/res/layout/filtershow_history_operation_row.xml b/res/layout/filtershow_history_operation_row.xml index 6f9ea1b8f..dd9b66e93 100644 --- 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 34d5c7bcb..efb8747f9 100644 --- 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" |
