diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2012-10-25 17:00:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-25 17:00:20 -0700 |
| commit | 7993e1f8392e8c1c84fc4efc9c79996eb85a9122 (patch) | |
| tree | 50cf8b31a9f083bd478a2db9663e71d5891a23e0 /src/com/android/gallery3d/filtershow | |
| parent | 817e1edb66e0b0b75494f46d4a509e4f48730a7f (diff) | |
| parent | 21a7aa3a269dfb68a771e010c0554b68f88a1466 (diff) | |
| download | android_packages_apps_Snap-7993e1f8392e8c1c84fc4efc9c79996eb85a9122.tar.gz android_packages_apps_Snap-7993e1f8392e8c1c84fc4efc9c79996eb85a9122.tar.bz2 android_packages_apps_Snap-7993e1f8392e8c1c84fc4efc9c79996eb85a9122.zip | |
Merge "Fix issue where aspect bounds don't get applied." into gb-ub-photos-arches
Diffstat (limited to 'src/com/android/gallery3d/filtershow')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/PanelController.java | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java | 2 |
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); |