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

Commit 915304ca authored by nicolasroard's avatar nicolasroard Committed by Android (Google) Code Review
Browse files

Merge "Move ImageCurves to the ImageShow package" into gb-ub-photos-carlsbad

parents 08f4cc39 368ae73a

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

+1 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ import com.android.gallery3d.filtershow.imageshow.GeometryMetadata; 
import com.android.gallery3d.filtershow.imageshow.ImageCrop;

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

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

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

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

import com.android.gallery3d.filtershow.pipeline.ProcessingService;

import com.android.gallery3d.filtershow.provider.SharedImageProvider;
@@ -92,7 +93,6 @@ import com.android.gallery3d.filtershow.tools.SaveImage; 
import com.android.gallery3d.filtershow.tools.XmpPresets;

import com.android.gallery3d.filtershow.tools.XmpPresets.XMresults;

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

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

import com.android.gallery3d.util.GalleryUtils;

import com.android.gallery3d.util.UsageStatistics;

import com.android.photos.data.GalleryBitmapPool;

src/com/android/gallery3d/filtershow/editors/EditorCurves.java

+1 −2
Original line number Diff line number Diff line
@@ -17,13 +17,12 @@ 
package com.android.gallery3d.filtershow.editors;



import android.content.Context;

import android.view.View;

import android.widget.FrameLayout;



import com.android.gallery3d.R;

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

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

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

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



public class EditorCurves extends Editor {

    public static final int ID = R.id.imageCurves;

src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ import android.util.JsonWriter; 
import android.util.Log;



import com.android.gallery3d.R;

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

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

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

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



import java.io.IOException;

src/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.gallery3d.filtershow.filters; 


import android.graphics.Bitmap;



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

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



public class ImageFilterCurves extends ImageFilter {

src/com/android/gallery3d/filtershow/ui/ControlPoint.java→src/com/android/gallery3d/filtershow/imageshow/ControlPoint.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.gallery3d.filtershow.ui;

package com.android.gallery3d.filtershow.imageshow;



public class ControlPoint implements Comparable {

    public float x;