Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4164fabf authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "Fix issue where aspect bounds don't get applied." into gb-ub-photos-arches

parents d72971e6 7f999551

src/com/android/gallery3d/filtershow/PanelController.java

+4 −0
Original line number Diff line number Diff line
@@ -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;

src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java

+1 −1
Original line number Diff line number Diff line
@@ -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);