diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 2 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/ui/FilterIconButton.java | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 3a2c6ecfd..a364d797e 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -458,6 +458,7 @@ public class PhotoUI implements PieListener, Util.fadeIn(mReviewDoneButton); mShutterButton.setVisibility(View.INVISIBLE); Util.fadeIn(mReviewRetakeButton); + pauseFaceDetection(); } protected void hidePostCaptureAlert() { @@ -466,6 +467,7 @@ public class PhotoUI implements PieListener, Util.fadeOut(mReviewDoneButton); mShutterButton.setVisibility(View.VISIBLE); Util.fadeOut(mReviewRetakeButton); + resumeFaceDetection(); } public void setDisplayOrientation(int orientation) { diff --git a/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java b/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java index a15060b59..c3c87694a 100644 --- a/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java +++ b/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java @@ -20,6 +20,7 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; +import android.graphics.RectF; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; @@ -30,6 +31,7 @@ import com.android.gallery3d.filtershow.cache.RenderingRequestCaller; import com.android.gallery3d.filtershow.category.Action; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.imageshow.GeometryListener; +import com.android.gallery3d.filtershow.imageshow.GeometryMetadata; import com.android.gallery3d.filtershow.imageshow.MasterImage; import com.android.gallery3d.filtershow.presets.ImagePreset; import com.android.gallery3d.filtershow.tools.IconFactory; @@ -148,6 +150,12 @@ public class FilterIconButton extends IconButton implements View.OnClickListener if (dst != null && mAction != null) { ImagePreset mPreset = new ImagePreset(); mPreset.addFilter(mFilterRepresentation); + + GeometryMetadata geometry = mPreset.mGeoData; + RectF bound = new RectF(0, 0, dst.getWidth(), dst.getHeight()); + geometry.setCropBounds(bound); + geometry.setPhotoBounds(bound); + RenderingRequest.post(dst.copy(Bitmap.Config.ARGB_8888, true), mPreset, RenderingRequest.ICON_RENDERING, this); } |