diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-12-01 11:23:47 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-12-01 11:23:47 -0800 |
| commit | e5113f67ac2d4b1e733988f543a2a20d2defc9e1 (patch) | |
| tree | 8da6c319ed066c08889e907145f56d4400fd18a6 /src/com | |
| parent | 29f83f75cd173020ca978578e9a41bec01059572 (diff) | |
| parent | a8e1a88c7e065b794a5eb20a743d7ecfb8b8377d (diff) | |
| download | android_packages_apps_Snap-e5113f67ac2d4b1e733988f543a2a20d2defc9e1.tar.gz android_packages_apps_Snap-e5113f67ac2d4b1e733988f543a2a20d2defc9e1.tar.bz2 android_packages_apps_Snap-e5113f67ac2d4b1e733988f543a2a20d2defc9e1.zip | |
Merge "Camera2: Disable shutter animation based on setprop"
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index c45d02703..1dd09dfd7 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -207,6 +207,7 @@ public class PhotoModule private static final String PERSIST_LONG_ENABLE = "persist.camera.longshot.enable"; private static final String PERSIST_LONG_SAVE = "persist.camera.longshot.save"; private static final String PERSIST_PREVIEW_RESTART = "persist.camera.feature.restart"; + private static final String PERSIST_CAPTURE_ANIMATION = "persist.camera.capture.animate"; private static final int MINIMUM_BRIGHTNESS = 0; private static final int MAXIMUM_BRIGHTNESS = 6; @@ -354,6 +355,7 @@ public class PhotoModule private static final int MANUAL_FOCUS = 1; private static final int MANUAL_WB = 2; private static final int MANUAL_EXPOSURE = 4; + private boolean mAnimateCapture = true; private MediaSaveService.OnMediaSavedListener mOnMediaSavedListener = new MediaSaveService.OnMediaSavedListener() { @@ -1300,7 +1302,9 @@ public class PhotoModule } else { mUI.setDownFactor(4); } - mUI.animateCapture(jpegData, orientation, mMirror); + if (mAnimateCapture) { + mUI.animateCapture(jpegData, orientation, mMirror); + } } } else { mJpegImageData = jpegData; @@ -2251,6 +2255,9 @@ public class PhotoModule mOnResumeTime = SystemClock.uptimeMillis(); checkDisplayRotation(); + + mAnimateCapture = SystemProperties.getBoolean( + PERSIST_CAPTURE_ANIMATION, true); } @Override |