summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-11-01 08:45:28 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-11-01 08:45:28 -0800
commit22e71d470f2c39d526ebaa1cecc08431982964ef (patch)
tree020c87b8b3a1bc54075bfb6b7ae79289329ba81b
parent57dc1e160409181bbe87a01a9b4e844a33c57a91 (diff)
parent7a77041934c0299da1de900a568f2db0949b1d6f (diff)
downloadandroid_packages_apps_Snap-22e71d470f2c39d526ebaa1cecc08431982964ef.tar.gz
android_packages_apps_Snap-22e71d470f2c39d526ebaa1cecc08431982964ef.tar.bz2
android_packages_apps_Snap-22e71d470f2c39d526ebaa1cecc08431982964ef.zip
Merge "Enable extended face detection feature."
-rw-r--r--src/com/android/camera/ui/FaceView.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java
index 9a1ef006d..0bdf0de15 100644
--- a/src/com/android/camera/ui/FaceView.java
+++ b/src/com/android/camera/ui/FaceView.java
@@ -34,7 +34,7 @@ import android.view.View;
import com.android.camera.PhotoUI;
import com.android.camera.util.CameraUtil;
import org.codeaurora.snapcam.R;
-//import org.codeaurora.camera.ExtendedFace;
+import org.codeaurora.camera.ExtendedFace;
public class FaceView extends View
implements FocusIndicator, Rotatable,
@@ -232,7 +232,7 @@ public class FaceView extends View
mPaint.setColor(mColor);
mRect.offset(dx, dy);
canvas.drawOval(mRect, mPaint);
-/*
+
if (mFaces[i] instanceof ExtendedFace) {
ExtendedFace face = (ExtendedFace)mFaces[i];
float[] point = new float[4];
@@ -383,7 +383,6 @@ public class FaceView extends View
}
}
}
-*/
}
canvas.restore();
}