Merge "Start Camera album in grid mode" into gb-ub-photos-arches
diff --git a/jni/filters/geometry.c b/jni/filters/geometry.c
index f2f5b27..8550dd7 100644
--- a/jni/filters/geometry.c
+++ b/jni/filters/geometry.c
@@ -19,14 +19,18 @@
void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterFlip, jobject src, jint srcWidth, jint srcHeight, jobject dst, jint dstWidth, jint dstHeight, jint flip) {
char* destination = 0;
char* source = 0;
+ int len = dstWidth * dstHeight * 4;
+ if (srcWidth != dstWidth || srcHeight != dstHeight) {
+ return;
+ }
AndroidBitmap_lockPixels(env, src, (void**) &source);
AndroidBitmap_lockPixels(env, dst, (void**) &destination);
int i = 0;
- for (; i < dstWidth * dstHeight * 4; i+=4) {
+ for (; i < len; i += 4) {
int r = source[RED];
int g = source[GREEN];
int b = source[BLUE];
-
+ // TODO: implement flip
destination[RED] = 255;
destination[GREEN] = g;
destination[BLUE] = b;
@@ -34,3 +38,63 @@
AndroidBitmap_unlockPixels(env, dst);
AndroidBitmap_unlockPixels(env, src);
}
+
+void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterRotate, jobject src, jint srcWidth, jint srcHeight, jobject dst, jint dstWidth, jint dstHeight, jfloat rotate) {
+ char* destination = 0;
+ char* source = 0;
+ int len = dstWidth * dstHeight * 4;
+ AndroidBitmap_lockPixels(env, src, (void**) &source);
+ AndroidBitmap_lockPixels(env, dst, (void**) &destination);
+ // TODO: implement rotate
+ int i = 0;
+ for (; i < len; i += 4) {
+ int r = source[RED];
+ int g = source[GREEN];
+ int b = source[BLUE];
+ destination[RED] = r;
+ destination[GREEN] = 255;
+ destination[BLUE] = b;
+ }
+ AndroidBitmap_unlockPixels(env, dst);
+ AndroidBitmap_unlockPixels(env, src);
+}
+
+void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterCrop, jobject src, jint srcWidth, jint srcHeight, jobject dst, jint dstWidth, jint dstHeight, jint offsetWidth, jint offsetHeight) {
+ char* destination = 0;
+ char* source = 0;
+ int len = dstWidth * dstHeight * 4;
+ AndroidBitmap_lockPixels(env, src, (void**) &source);
+ AndroidBitmap_lockPixels(env, dst, (void**) &destination);
+ // TODO: implement crop
+ int i = 0;
+ for (; i < len; i += 4) {
+ int r = source[RED];
+ int g = source[GREEN];
+ int b = source[BLUE];
+ destination[RED] = r;
+ destination[GREEN] = g;
+ destination[BLUE] = 255;
+ }
+ AndroidBitmap_unlockPixels(env, dst);
+ AndroidBitmap_unlockPixels(env, src);
+}
+
+void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterStraighten, jobject src, jint srcWidth, jint srcHeight, jobject dst, jint dstWidth, jint dstHeight, jfloat straightenAngle) {
+ char* destination = 0;
+ char* source = 0;
+ int len = dstWidth * dstHeight * 4;
+ AndroidBitmap_lockPixels(env, src, (void**) &source);
+ AndroidBitmap_lockPixels(env, dst, (void**) &destination);
+ // TODO: implement straighten
+ int i = 0;
+ for (; i < len; i += 4) {
+ int r = source[RED];
+ int g = source[GREEN];
+ int b = source[BLUE];
+ destination[RED] = 128;
+ destination[GREEN] = g;
+ destination[BLUE] = 128;
+ }
+ AndroidBitmap_unlockPixels(env, dst);
+ AndroidBitmap_unlockPixels(env, src);
+}
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index aecbb16..5c9c598 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -1169,6 +1169,8 @@
mHandler.removeMessages(MSG_UNFREEZE_GLROOT);
DetailsHelper.pause();
+ // Hide the detail dialog on exit
+ if (mShowDetails) hideDetails();
if (mModel != null) {
if (isFinishing()) preparePhotoFallbackView();
mModel.pause();
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 6d61441..02ffe75 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -34,13 +34,13 @@
import com.android.gallery3d.filtershow.filters.ImageFilterBorder;
import com.android.gallery3d.filtershow.filters.ImageFilterRS;
import com.android.gallery3d.filtershow.imageshow.ImageBorder;
+import com.android.gallery3d.filtershow.imageshow.ImageCrop;
+import com.android.gallery3d.filtershow.imageshow.ImageFlip;
+import com.android.gallery3d.filtershow.imageshow.ImageRotate;
import com.android.gallery3d.filtershow.imageshow.ImageShow;
import com.android.gallery3d.filtershow.imageshow.ImageSmallFilter;
import com.android.gallery3d.filtershow.imageshow.ImageStraighten;
import com.android.gallery3d.filtershow.imageshow.ImageZoom;
-import com.android.gallery3d.filtershow.imageshow.ImageFlip;
-import com.android.gallery3d.filtershow.imageshow.ImageCrop;
-import com.android.gallery3d.filtershow.imageshow.ImageRotate;
import com.android.gallery3d.filtershow.presets.ImagePreset;
import com.android.gallery3d.filtershow.presets.ImagePresetBW;
import com.android.gallery3d.filtershow.presets.ImagePresetBWBlue;
@@ -225,6 +225,7 @@
SeekBar seekBar = (SeekBar) findViewById(R.id.filterSeekBar);
seekBar.setMax(200);
mImageShow.setSeekBar(seekBar);
+ mImageZoom.setSeekBar(seekBar);
mPanelController.setRowPanel(findViewById(R.id.secondRowPanel));
mPanelController.setUtilityPanel(this, findViewById(R.id.filterButtonsList),
findViewById(R.id.compareWithOriginalImage),
diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index 8d8024e..54d71ad 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -232,7 +232,10 @@
if (bmp != null) {
// TODO: this workaround for RS might not be needed ultimately
Bitmap bmp2 = bmp.copy(Bitmap.Config.ARGB_8888, true);
+ float scaleFactor = imagePreset.getScaleFactor();
+ imagePreset.setScaleFactor(1.0f);
bmp2 = imagePreset.apply(bmp2);
+ imagePreset.setScaleFactor(scaleFactor);
mZoomCache.setImage(imagePreset, bounds, bmp2);
return bmp2;
}
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
index 69a8f20..1368255 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.android.gallery3d.filtershow.filters;
@@ -5,13 +20,21 @@
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Rect;
+import android.graphics.RectF;
+import android.util.Log;
import com.android.gallery3d.filtershow.imageshow.GeometryMetadata;
import com.android.gallery3d.filtershow.imageshow.GeometryMetadata.FLIP;
+import com.android.gallery3d.filtershow.imageshow.ImageGeometry;
public class ImageFilterGeometry extends ImageFilter {
private final Bitmap.Config mConfig = Bitmap.Config.ARGB_8888;
private GeometryMetadata mGeometry = null;
+ private static final String LOGTAG = "ImageFilterGeometry";
+ private static final boolean LOGV = false;
+ private static final int BOTH = 3;
+ private static final int VERTICAL = 2;
+ private static final int HORIZONTAL = 1;
public ImageFilterGeometry() {
mName = "Geometry";
@@ -23,22 +46,109 @@
return filter;
}
- public void setGeometryMetadata(GeometryMetadata m){
+ public void setGeometryMetadata(GeometryMetadata m) {
mGeometry = m;
}
native protected void nativeApplyFilterFlip(Bitmap src, int srcWidth, int srcHeight,
Bitmap dst, int dstWidth, int dstHeight, int flip);
+ native protected void nativeApplyFilterRotate(Bitmap src, int srcWidth, int srcHeight,
+ Bitmap dst, int dstWidth, int dstHeight, float rotate);
+
+ native protected void nativeApplyFilterCrop(Bitmap src, int srcWidth, int srcHeight,
+ Bitmap dst, int dstWidth, int dstHeight, int offsetWidth, int offsetHeight);
+
+ native protected void nativeApplyFilterStraighten(Bitmap src, int srcWidth, int srcHeight,
+ Bitmap dst, int dstWidth, int dstHeight, float straightenAngle);
+
@Override
- public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) {
- if(mGeometry.getFlipType() == FLIP.NONE){
- return bitmap;
+ public Bitmap apply(Bitmap originalBitmap, float scaleFactor, boolean highQuality) {
+ Rect cropBounds = new Rect();
+ Rect originalBounds = new Rect();
+ FLIP flipType = mGeometry.getFlipType();
+ float rAngle = mGeometry.getRotation();
+ float sAngle = mGeometry.getStraightenRotation();
+ mGeometry.getCropBounds().roundOut(cropBounds);
+ mGeometry.getPhotoBounds().roundOut(originalBounds);
+ boolean flip = flipType != FLIP.NONE;
+ boolean rotate = rAngle != 0;
+ boolean crop = !cropBounds.equals(originalBounds);
+ boolean straighten = sAngle != 0;
+
+ int jniFlipType = 0;
+ switch (flipType) {
+ case BOTH:
+ jniFlipType = BOTH;
+ break;
+ case VERTICAL:
+ jniFlipType = VERTICAL;
+ break;
+ case HORIZONTAL:
+ jniFlipType = HORIZONTAL;
+ break;
+ default:
+ jniFlipType = 0;
+ break;
}
- Bitmap flipBitmap = bitmap.copy(mConfig, true);
- nativeApplyFilterFlip(bitmap, bitmap.getWidth(), bitmap.getHeight(), flipBitmap,
- flipBitmap.getWidth(), flipBitmap.getHeight(), 1);
- return flipBitmap;
+ int bmWidth = originalBitmap.getWidth();
+ int bmHeight = originalBitmap.getHeight();
+ if (!(flip || rotate || crop || straighten)) {
+ return originalBitmap;
+ }
+ if (originalBounds.width() != bmWidth || originalBounds.height() != bmHeight) {
+ if (LOGV)
+ Log.v(LOGTAG, "PHOTOBOUNDS WIDTH/HEIGHT NOT SAME AS BITMAP WIDTH/HEIGHT");
+ return originalBitmap;
+ }
+ Bitmap modBitmap = originalBitmap;
+ Rect modifiedBounds = new Rect(originalBounds);
+ if (flip) {
+ modBitmap = originalBitmap.copy(mConfig, true);
+ nativeApplyFilterFlip(originalBitmap, bmWidth, bmHeight, modBitmap,
+ bmWidth, bmHeight, jniFlipType);
+ }
+ if (rotate) {
+ // Fails for non-90 degree rotations
+ Bitmap modBitmapRotate = null;
+ if (((int) (sAngle / 90)) % 2 == 0) {
+ modBitmapRotate = Bitmap.createBitmap(bmWidth, bmHeight, mConfig);
+ nativeApplyFilterRotate(modBitmap, bmWidth, bmHeight, modBitmapRotate,
+ bmWidth, bmHeight, mGeometry.getRotation());
+ modifiedBounds = new Rect(0, 0, bmWidth, bmHeight);
+ } else {
+ modBitmapRotate = Bitmap.createBitmap(bmHeight, bmWidth, mConfig);
+ nativeApplyFilterRotate(modBitmap, bmWidth, bmHeight, modBitmapRotate,
+ bmHeight, bmWidth, mGeometry.getRotation());
+ modifiedBounds = new Rect(0, 0, bmHeight, bmWidth);
+ }
+ modBitmap = modBitmapRotate;
+ }
+ if (straighten) {
+ Rect straightenBounds = new Rect();
+ ImageGeometry.getUntranslatedStraightenCropBounds(new RectF(modifiedBounds), sAngle)
+ .roundOut(straightenBounds);
+ Bitmap modBitmapStraighten = Bitmap.createBitmap(straightenBounds.width(),
+ straightenBounds.height(), mConfig);
+ nativeApplyFilterStraighten(modBitmap, modifiedBounds.width(), modifiedBounds.height(),
+ modBitmapStraighten,
+ straightenBounds.width(), straightenBounds.height(),
+ mGeometry.getStraightenRotation());
+ modifiedBounds = straightenBounds;
+ modBitmap = modBitmapStraighten;
+ }
+ if (crop) {
+ Bitmap modBitmapCrop = Bitmap.createBitmap(cropBounds.width(), cropBounds.height(),
+ mConfig);
+ // Force crop bounds to be within straighten bounds.
+ if (!modifiedBounds.intersect(cropBounds)) {
+ return modBitmap;
+ }
+ nativeApplyFilterCrop(modBitmap, bmWidth, bmHeight, modBitmapCrop,
+ cropBounds.width(), cropBounds.height(), cropBounds.left, cropBounds.top);
+ modBitmap = modBitmapCrop;
+ }
+ return modBitmap;
}
}
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
index ab92e4e..37c5526 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
@@ -21,7 +21,8 @@
mOutPixelsAllocation = Allocation.createTyped(mRS, mInPixelsAllocation.getType());
}
- public void createFilter(android.content.res.Resources res) {
+ public void createFilter(android.content.res.Resources res, float scaleFactor,
+ boolean highQuality) {
}
public void runFilter() {
@@ -38,7 +39,7 @@
}
try {
prepare(bitmap);
- createFilter(mResources);
+ createFilter(mResources, scaleFactor, highQuality);
runFilter();
update(bitmap);
} catch (android.renderscript.RSIllegalArgumentException e) {
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
index 3ec7b5f..d28e405 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
@@ -1,12 +1,6 @@
package com.android.gallery3d.filtershow.filters;
-import android.graphics.Bitmap;
-import android.util.Log;
-import android.renderscript.Element;
-import android.renderscript.Script;
-import android.renderscript.ScriptC;
-
import com.android.gallery3d.R;
public class ImageFilterSharpen extends ImageFilterRS {
@@ -18,11 +12,13 @@
mName = "Sharpen";
}
- public void createFilter(android.content.res.Resources res) {
+ @Override
+ public void createFilter(android.content.res.Resources res, float scaleFactor,
+ boolean highQuality) {
int w = mInPixelsAllocation.getType().getX();
int h = mInPixelsAllocation.getType().getY();
- float p1 = mParameter;
+ float p1 = mParameter * scaleFactor;
float value = p1 / 100.0f;
float f[] = new float[9];
float p = value;
@@ -43,6 +39,7 @@
mScript.set_gHeight(h);
}
+ @Override
public void runFilter() {
mScript.set_gIn(mInPixelsAllocation);
mScript.bind_gPixels(mInPixelsAllocation);
diff --git a/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java b/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
index f3d64a5..4f17228 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
@@ -53,7 +53,15 @@
public Bitmap apply(Bitmap original, float scaleFactor, boolean highQuality){
mImageFilter.setGeometryMetadata(this);
- return mImageFilter.apply(original, scaleFactor, highQuality);
+ Bitmap m = mImageFilter.apply(original, scaleFactor, highQuality);
+ mPhotoBounds.set(0,0, m.getWidth(), m.getHeight());
+ mCropBounds.set(mPhotoBounds);
+ mScaleFactor = 0;
+ mRotation = 0;
+ mStraightenRotation = 0;
+ mFlip = FLIP.NONE;
+ mSafe = false;
+ return m;
}
public GeometryMetadata(float scale, float rotation, float straighten, RectF cropBounds,
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
index c6709e8..606e477 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
@@ -499,6 +499,16 @@
}
protected RectF getStraightenCropBounds(RectF imageRect, float straightenAngle) {
+ RectF boundsRect = getUntranslatedStraightenCropBounds(imageRect, straightenAngle);
+ RectF nonRotateImage = getLocalPhotoBounds();
+ Matrix m1 = new Matrix();
+ m1.setTranslate(nonRotateImage.centerX() - boundsRect.centerX(), nonRotateImage.centerY()
+ - boundsRect.centerY());
+ m1.mapRect(boundsRect);
+ return boundsRect;
+ }
+
+ public static RectF getUntranslatedStraightenCropBounds(RectF imageRect, float straightenAngle) {
float deg = straightenAngle;
if (deg < 0) {
deg = -deg;
@@ -519,13 +529,7 @@
float right = (float) (left + ww);
float bottom = (float) (top + hh);
- RectF boundsRect = new RectF(left, top, right, bottom);
- RectF nonRotateImage = getLocalPhotoBounds();
- Matrix m1 = new Matrix();
- m1.setTranslate(nonRotateImage.centerX() - boundsRect.centerX(), nonRotateImage.centerY()
- - boundsRect.centerY());
- m1.mapRect(boundsRect);
- return boundsRect;
+ return new RectF(left, top, right, bottom);
}
protected void drawShadows(Canvas canvas, RectF innerBounds, RectF outerBounds, Paint p) {
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index d6d3793..809585d 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -60,20 +60,21 @@
protected Bitmap mForegroundImage = null;
protected Bitmap mFilteredImage = null;
+ private final boolean USE_SLIDER_GESTURE = false; // set to true to have
+ // slider gesture
protected SliderController mSliderController = new SliderController();
private HistoryAdapter mHistoryAdapter = null;
private ImageStateAdapter mImageStateAdapter = null;
- protected GeometryMetadata getGeometry(){
- return new GeometryMetadata(mImagePreset.mGeoData);
+ protected GeometryMetadata getGeometry() {
+ return new GeometryMetadata(getImagePreset().mGeoData);
}
- public void setGeometry(GeometryMetadata d){
- mImagePreset.mGeoData.set(d);
+ public void setGeometry(GeometryMetadata d) {
+ getImagePreset().mGeoData.set(d);
}
-
private boolean mShowControls = false;
private boolean mShowOriginal = false;
private String mToast = null;
@@ -93,6 +94,9 @@
int parameter = getCurrentFilter().getParameter();
updateSeekBar(parameter);
}
+ if (mSeekBar != null) {
+ mSeekBar.setOnSeekBarChangeListener(this);
+ }
}
public void updateSeekBar(int parameter) {
@@ -112,7 +116,9 @@
public void resetParameter() {
onNewValue(0);
- mSliderController.reset();
+ if (USE_SLIDER_GESTURE) {
+ mSliderController.reset();
+ }
}
public void setPanelController(PanelController controller) {
@@ -152,7 +158,9 @@
public ImageShow(Context context, AttributeSet attrs) {
super(context, attrs);
- mSliderController.setListener(this);
+ if (USE_SLIDER_GESTURE) {
+ mSliderController.setListener(this);
+ }
mHistoryAdapter = new HistoryAdapter(context, R.layout.filtershow_history_operation_row,
R.id.rowTextView);
mImageStateAdapter = new ImageStateAdapter(context,
@@ -161,7 +169,9 @@
public ImageShow(Context context) {
super(context);
- mSliderController.setListener(this);
+ if (USE_SLIDER_GESTURE) {
+ mSliderController.setListener(this);
+ }
mHistoryAdapter = new HistoryAdapter(context, R.layout.filtershow_history_operation_row,
R.id.rowTextView);
}
@@ -171,13 +181,14 @@
int parentWidth = MeasureSpec.getSize(widthMeasureSpec);
int parentHeight = MeasureSpec.getSize(heightMeasureSpec);
setMeasuredDimension(parentWidth, parentHeight);
- mSliderController.setWidth(parentWidth);
- mSliderController.setHeight(parentHeight);
+ if (USE_SLIDER_GESTURE) {
+ mSliderController.setWidth(parentWidth);
+ mSliderController.setHeight(parentHeight);
+ }
}
public void setSeekBar(SeekBar seekBar) {
mSeekBar = seekBar;
- mSeekBar.setOnSeekBarChangeListener(this);
}
public void setCurrentFilter(ImageFilter filter) {
@@ -213,7 +224,7 @@
public Rect getImageBounds() {
Rect dst = new Rect();
- mImagePreset.mGeoData.getPhotoBounds().roundOut(dst);
+ getImagePreset().mGeoData.getPhotoBounds().roundOut(dst);
return dst;
}
@@ -273,7 +284,9 @@
canvas.drawLine(0, 0, getWidth(), 0, mPaint);
if (showControls()) {
- mSliderController.onDraw(canvas);
+ if (USE_SLIDER_GESTURE) {
+ mSliderController.onDraw(canvas);
+ }
}
drawToast(canvas);
@@ -383,11 +396,11 @@
}
}
- protected void setDirtyGeometryFlag(){
+ protected void setDirtyGeometryFlag() {
mDirtyGeometry = true;
}
- protected void clearDirtyGeometryFlag(){
+ protected void clearDirtyGeometryFlag() {
mDirtyGeometry = false;
}
@@ -396,14 +409,13 @@
}
private void imageSizeChanged(Bitmap image) {
- if(image == null || mImagePreset == null)
+ if (image == null || getImagePreset() == null)
return;
float w = image.getWidth();
float h = image.getHeight();
RectF r = new RectF(0, 0, w, h);
- RectF c = new RectF(w/4f, h/4f, w * 3/4f, h * 3/4f);
- mImagePreset.mGeoData.setPhotoBounds(r);
- mImagePreset.mGeoData.setCropBounds(c);
+ getImagePreset().mGeoData.setPhotoBounds(r);
+ getImagePreset().mGeoData.setCropBounds(r);
setDirtyGeometryFlag();
}
@@ -423,7 +435,9 @@
@Override
public boolean onTouchEvent(MotionEvent event) {
super.onTouchEvent(event);
- mSliderController.onTouchEvent(event);
+ if (USE_SLIDER_GESTURE) {
+ mSliderController.onTouchEvent(event);
+ }
invalidate();
return true;
}
@@ -450,19 +464,19 @@
}
public float getImageRotation() {
- return mImagePreset.mGeoData.getRotation();
+ return getImagePreset().mGeoData.getRotation();
}
public float getImageRotationZoomFactor() {
- return mImagePreset.mGeoData.getScaleFactor();
+ return getImagePreset().mGeoData.getScaleFactor();
}
- public void setImageRotation(float r){
- mImagePreset.mGeoData.setRotation(r);
+ public void setImageRotation(float r) {
+ getImagePreset().mGeoData.setRotation(r);
}
- public void setImageRotationZoomFactor(float f){
- mImagePreset.mGeoData.setScaleFactor(f);
+ public void setImageRotationZoomFactor(float f) {
+ getImagePreset().mGeoData.setScaleFactor(f);
}
public void setImageRotation(float imageRotation,
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageZoom.java b/src/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
index 1c5a9b5..a2b119c 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
@@ -1,11 +1,8 @@
package com.android.gallery3d.filtershow.imageshow;
-import com.android.gallery3d.filtershow.presets.ImagePreset;
-
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
-import android.graphics.Paint;
import android.graphics.Rect;
import android.util.AttributeSet;
import android.view.GestureDetector;
@@ -33,12 +30,14 @@
mGestureDetector = new GestureDetector(context, this);
}
+ @Override
public boolean onTouchEvent(MotionEvent event) {
boolean ret = mGestureDetector.onTouchEvent(event);
ret = super.onTouchEvent(event);
return ret;
}
+ @Override
public void onTouchDown(float x, float y) {
super.onTouchDown(x, y);
if (mZoomedIn || mTouchDown) {
@@ -64,10 +63,12 @@
mZoomBounds = new Rect(left, top, left + mw * 2, top + mh * 2);
}
+ @Override
public void onTouchUp() {
mTouchDown = false;
}
+ @Override
public void onDraw(Canvas canvas) {
drawBackground(canvas);
Bitmap filteredImage = null;
@@ -121,7 +122,13 @@
}
@Override
- public boolean onDoubleTap(MotionEvent arg0) {
+ public boolean onDoubleTap(MotionEvent event) {
+
+ if (!mZoomedIn) {
+ onTouchDown(event.getX(), event.getY());
+ } else {
+ onTouchUp();
+ }
mZoomedIn = !mZoomedIn;
invalidate();
return false;