Set crop ratio to unconstrained by default.

bug:7634466
Change-Id: I4b0e82ca77ab19527293334cc96e7b80f2d75535

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 529a29b..26bd183 100644 (file)
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -186,7 +186,7 @@
                         android:background="@drawable/filtershow_button_background"
                         android:scaleType="centerInside"
                         android:visibility="gone"
-                        android:text="@string/aspectOriginal_effect" />
+                        android:text="@string/aspectNone_effect" />
 
                     <com.android.gallery3d.filtershow.ui.FramedTextButton
                         android:id="@+id/pickCurvesChannel"

diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 03a9d8b..00af7e5 100644 (file)
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -41,7 +41,6 @@ import com.android.gallery3d.filtershow.filters.ImageFilterVibrance;
 import com.android.gallery3d.filtershow.filters.ImageFilterVignette;
 import com.android.gallery3d.filtershow.filters.ImageFilterWBalance;
 import com.android.gallery3d.filtershow.imageshow.ImageCrop;
-import com.android.gallery3d.filtershow.imageshow.ImageGeometry;
 import com.android.gallery3d.filtershow.imageshow.ImageShow;
 import com.android.gallery3d.filtershow.presets.ImagePreset;
 import com.android.gallery3d.filtershow.ui.FramedTextButton;
@@ -594,7 +593,7 @@ public class PanelController implements OnClickListener {
                 mUtilityPanel.setEffectName(ename);
                 mUtilityPanel.setShowParameter(false);
                 if (mCurrentImage instanceof ImageCrop && mUtilityPanel.firstTimeCropDisplayed){
-                    ((ImageCrop) mCurrentImage).applyOriginal();
+                    ((ImageCrop) mCurrentImage).applyClear();
                     mUtilityPanel.firstTimeCropDisplayed = false;
                 }
                 mUtilityPanel.showAspectButtons();

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
index 35e8ad4..a031fa5 100644 (file)
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
@@ -581,7 +581,7 @@ public class ImageCrop extends ImageGeometry {
     public void imageLoaded() {
         super.imageLoaded();
         syncLocalToMasterGeometry();
-        applyOriginal();
+        applyClear();
         invalidate();
     }