diff options
| author | Doris Liu <tianliu@google.com> | 2013-05-14 14:26:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-14 14:26:53 -0700 |
| commit | 7e072be494fa0c46b1f0aeda4cdbf35e8d55fbf5 (patch) | |
| tree | 611ca74795706e4a472d0f725236797fdbce881e /src/com | |
| parent | 7f9e16ed4a4feb1d7ae15fb9e73d84d95ee53c2d (diff) | |
| parent | d31cdfeb1035df8ba939e877031769f0df247aa6 (diff) | |
| download | android_packages_apps_Snap-7e072be494fa0c46b1f0aeda4cdbf35e8d55fbf5.tar.gz android_packages_apps_Snap-7e072be494fa0c46b1f0aeda4cdbf35e8d55fbf5.tar.bz2 android_packages_apps_Snap-7e072be494fa0c46b1f0aeda4cdbf35e8d55fbf5.zip | |
am 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce
* commit '26dbb20c15e27d22a14efd0a25ec4e50cf5084cc':
Pause face detection when review captured images
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 2 |
1 files changed, 2 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) { |