summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorAlok Kediya <kediya@codeaurora.org>2013-09-28 16:30:15 +0530
committerLinux Build Service Account <lnxbuild@localhost>2013-10-31 19:39:28 -0600
commit7e531098757919768a540f969f9a7929f5c157c5 (patch)
treea3a2d03bbab1096a1ee46e16e666b1b336bc8153 /src/com/android/camera/PhotoMenu.java
parentc862c8b5005e9325acc3f7511cb6136e7b77f720 (diff)
downloadandroid_packages_apps_Snap-7e531098757919768a540f969f9a7929f5c157c5.tar.gz
android_packages_apps_Snap-7e531098757919768a540f969f9a7929f5c157c5.tar.bz2
android_packages_apps_Snap-7e531098757919768a540f969f9a7929f5c157c5.zip
Camera: Adds support for Face Recognition enable
- This change enables the camera client to configure the face recognition feature depending on the camera support of the lower layers. (cherrypicked from commit 9d469e2a66859fe5070d9651a41d0ca330ccc8cb) Change-Id: I141632e27cbef3bb53ea06a249491eff78b5f13b (cherry picked from commit b420162dd9c1f974628e8e7ff83bc0909c59e272) (cherry picked from commit 9c258ff94e7ce18c7e4072b83203092bd3d4c0d1)
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 0f35e3699..0f2a94dea 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -121,6 +121,7 @@ public class PhotoMenu extends PieController
mOtherKeys2 = new String[] {
CameraSettings.KEY_COLOR_EFFECT,
CameraSettings.KEY_FACE_DETECTION,
+ CameraSettings.KEY_FACE_RECOGNITION,
CameraSettings.KEY_TOUCH_AF_AEC,
CameraSettings.KEY_SELECTABLE_ZONE_AF,
CameraSettings.KEY_SATURATION,