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

Commit 92b91af5 authored by nicolasroard's avatar nicolasroard Committed by Android Git Automerger
Browse files

am 33a487f6: am 6d867ce0: Set crop ratio to unconstrained by default. 

* commit '33a487f6':
  Set crop ratio to unconstrained by default.
parents 39b06307 33a487f6

res/layout/filtershow_activity.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -186,7 +186,7 @@ 
                        android:background="@drawable/filtershow_button_background"

                        android:background="@drawable/filtershow_button_background"

                        android:scaleType="centerInside"

                        android:scaleType="centerInside"

                        android:visibility="gone"

                        android:visibility="gone"

                        android:text="@string/aspectOriginal_effect" />

                        android:text="@string/aspectNone_effect" />





                    <com.android.gallery3d.filtershow.ui.FramedTextButton

                    <com.android.gallery3d.filtershow.ui.FramedTextButton

                        android:id="@+id/pickCurvesChannel"

                        android:id="@+id/pickCurvesChannel"

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ import com.android.gallery3d.filtershow.filters.ImageFilterVibrance; 
import com.android.gallery3d.filtershow.filters.ImageFilterVignette;

import com.android.gallery3d.filtershow.filters.ImageFilterVignette;

import com.android.gallery3d.filtershow.filters.ImageFilterWBalance;

import com.android.gallery3d.filtershow.filters.ImageFilterWBalance;

import com.android.gallery3d.filtershow.imageshow.ImageCrop;

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.imageshow.ImageShow;

import com.android.gallery3d.filtershow.presets.ImagePreset;

import com.android.gallery3d.filtershow.presets.ImagePreset;

import com.android.gallery3d.filtershow.ui.FramedTextButton;

import com.android.gallery3d.filtershow.ui.FramedTextButton;
@@ -594,7 +593,7 @@ public class PanelController implements OnClickListener { 
                mUtilityPanel.setEffectName(ename);

                mUtilityPanel.setEffectName(ename);

                mUtilityPanel.setShowParameter(false);

                mUtilityPanel.setShowParameter(false);

                if (mCurrentImage instanceof ImageCrop && mUtilityPanel.firstTimeCropDisplayed){

                if (mCurrentImage instanceof ImageCrop && mUtilityPanel.firstTimeCropDisplayed){

                    ((ImageCrop) mCurrentImage).applyOriginal();

                    ((ImageCrop) mCurrentImage).applyClear();

                    mUtilityPanel.firstTimeCropDisplayed = false;

                    mUtilityPanel.firstTimeCropDisplayed = false;

                }

                }

                mUtilityPanel.showAspectButtons();

                mUtilityPanel.showAspectButtons();

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -581,7 +581,7 @@ public class ImageCrop extends ImageGeometry { 
    public void imageLoaded() {

    public void imageLoaded() {

        super.imageLoaded();

        super.imageLoaded();

        syncLocalToMasterGeometry();

        syncLocalToMasterGeometry();

        applyOriginal();

        applyClear();

        invalidate();

        invalidate();

    }

    }