commit 25844e7574949fd6f5cd9f35f1e1e6697c274b20
author nicolasroard <nicolasroard@google.com> Thu Oct 11 18:12:09 2012 -0700
committer nicolasroard <nicolasroard@google.com> Thu Oct 11 19:50:22 2012 -0700
tree 6feb76ef3fd3500a6ebad2934fc875e1b5f8cf7f
parent 6616c28733e84ff883b5b6a9852713380bf84769

Fixes Rotate, Flip, Straighten tools.

bug:7314849
Bug:7224232
Bug:7218935
Change-Id: I418287ff1f81c25f8e089821d823dc29ee62ff0e

res/layout/filtershow_activity.xml

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 7417374..f2b4736 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -114,11 +114,13 @@
                 android:layout_height="wrap_content"
                 android:visibility="gone" />
 
+            <!--
             <com.android.gallery3d.filtershow.imageshow.ImageCrop
                 android:id="@+id/imageCrop"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone" />
+             -->
 
             <com.android.gallery3d.filtershow.imageshow.ImageRotate
                 android:id="@+id/imageRotate"

src/com/android/gallery3d/filtershow/presets/ImagePreset.java

diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 18aa1fb..42dbcb9 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -79,7 +79,7 @@
         mHistoryName = name;
     }
 
-    private void setHistoryName(String name) {
+    public void setHistoryName(String name) {
         mHistoryName = name;
     }