summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2012-10-24 18:24:34 -0700
committerRuben Brunk <rubenbrunk@google.com>2012-10-25 16:43:01 -0700
commit7f999551167ce313e36ba35e3682593f8cf80e52 (patch)
tree2f54e82db7ceaeedf3305a1bdbd4970a28f9197c /src/com
parent71c177759c7aa10082c8fdf909b701cf0047bead (diff)
downloadandroid_packages_apps_Gallery2-7f999551167ce313e36ba35e3682593f8cf80e52.tar.gz
android_packages_apps_Gallery2-7f999551167ce313e36ba35e3682593f8cf80e52.tar.bz2
android_packages_apps_Gallery2-7f999551167ce313e36ba35e3682593f8cf80e52.zip
Fix issue where aspect bounds don't get applied.
Bug: 7407937 Change-Id: Ie6484d6458657d6284e04de755a8cc1a912dfb6c
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/gallery3d/filtershow/PanelController.java4
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 4ed2d0d3c..03a9d8bd5 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -41,6 +41,7 @@ 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;
@@ -708,6 +709,9 @@ public class PanelController implements OnClickListener {
if (mMasterImage.getCurrentFilter() instanceof ImageFilterTinyPlanet) {
mActivity.saveImage();
} else {
+ if (mCurrentImage instanceof ImageCrop) {
+ ((ImageCrop) mCurrentImage).saveAndSetPreset();
+ }
showPanel(mCurrentPanel);
}
break;
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
index af4290df9..f99e61473 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
@@ -361,7 +361,7 @@ public abstract class ImageGeometry extends ImageSlave {
return "Geometry";
}
- protected void saveAndSetPreset() {
+ public void saveAndSetPreset() {
ImagePreset lastHistoryItem = getHistory().getLast();
if (lastHistoryItem != null && lastHistoryItem.historyName().equalsIgnoreCase(getName())) {
getImagePreset().setGeometry(mLocalGeometry);