commit c2f813a36711742af3b23743ef1849cec13a9a95
author Michael Kolb <kolby@google.com> Wed May 15 18:55:19 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 15 18:55:19 2013 +0000
tree 8adc4c238d33fdb3af8610fa628d6d410d0b0e29
parent 655e208d5dc1305d9e4eb5301dec0673136151c9
parent dff7d0ec9cb635ef7381e518d32de5b7457dd655

Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce

src/com/android/camera/PhotoUI.java

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 3a2c6ec..a364d79 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -458,6 +458,7 @@
         Util.fadeIn(mReviewDoneButton);
         mShutterButton.setVisibility(View.INVISIBLE);
         Util.fadeIn(mReviewRetakeButton);
+        pauseFaceDetection();
     }
 
     protected void hidePostCaptureAlert() {
@@ -466,6 +467,7 @@
         Util.fadeOut(mReviewDoneButton);
         mShutterButton.setVisibility(View.VISIBLE);
         Util.fadeOut(mReviewRetakeButton);
+        resumeFaceDetection();
     }
 
     public void setDisplayOrientation(int orientation) {

src/com/android/camera/ui/PieRenderer.java

diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java
index bdbe612..edae2be 100644
--- a/src/com/android/camera/ui/PieRenderer.java
+++ b/src/com/android/camera/ui/PieRenderer.java
@@ -355,7 +355,7 @@
     private void layoutPie() {
         mCenterAngle = getCenterAngle();
         layoutItems(0, getRoot().getItems());
-        layoutLabel(0);
+        layoutLabel(getLevel());
     }
 
     private void layoutLabel(int level) {

src/com/android/gallery3d/filtershow/ui/FilterIconButton.java

diff --git a/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java b/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java
index a15060b..c3c8769 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.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.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 @@
         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);
         }