diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-11-28 22:00:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-28 22:00:50 -0800 |
| commit | 1eb3c0af3d9542e68eb18d312dad87485f058378 (patch) | |
| tree | f36dc211f1921f2ef0b53a3bf964191350c2fb2c /src | |
| parent | 6bf21d89f32634e52aa3b18743585c224441b145 (diff) | |
| parent | 6d867ce03ea96495d531d7e3f35a21b5aab257ef (diff) | |
| download | android_packages_apps_Gallery2-1eb3c0af3d9542e68eb18d312dad87485f058378.tar.gz android_packages_apps_Gallery2-1eb3c0af3d9542e68eb18d312dad87485f058378.tar.bz2 android_packages_apps_Gallery2-1eb3c0af3d9542e68eb18d312dad87485f058378.zip | |
am 6d867ce0: Set crop ratio to unconstrained by default.
* commit '6d867ce03ea96495d531d7e3f35a21b5aab257ef':
Set crop ratio to unconstrained by default.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/PanelController.java | 3 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index 03a9d8bd5..00af7e5a9 100644 --- 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 35e8ad4b7..a031fa58c 100644 --- 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(); } |