diff options
| author | pezhan <pezhan@codeaurora.org> | 2017-01-12 14:56:43 +0800 |
|---|---|---|
| committer | pezhan <pezhan@codeaurora.org> | 2017-01-12 15:27:34 +0800 |
| commit | 3c8acd4f9e99615e9c05c21d96cb995770cec6a5 (patch) | |
| tree | 635ef7f96ef2c2dc44800fa173425e994edd7395 /src/com/android/camera/util | |
| parent | 326822d1e444da7b227be3c86815e3ee6eb6453d (diff) | |
| download | android_packages_apps_Snap-3c8acd4f9e99615e9c05c21d96cb995770cec6a5.tar.gz android_packages_apps_Snap-3c8acd4f9e99615e9c05c21d96cb995770cec6a5.tar.bz2 android_packages_apps_Snap-3c8acd4f9e99615e9c05c21d96cb995770cec6a5.zip | |
SnapdragonCamera: Fix Can't edit UbiFocus mode picture when screen locked.
When enter the RefocusActivity, the keyguard will cover this activity.
Add flags if it's SecureCamera and UbiFocus mode when enter
RefocusActivity, the keyguard will dismiss. RefocusActivity will
display normally.
Add display the thumbnail when click shutter button under SecureCamera and
UbiFocus mode also it is Refocus.
Add display the thumbnail when when back from RefocusActivity under
SecureCamera and UbiFocus mode also it is Refocus.
Change-Id: I158d77b6c9132162a5414987dc4f5d61cc4ef31d
CRs-Fixed: 1108273
Diffstat (limited to 'src/com/android/camera/util')
| -rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index bcecae7f8..f6591a6db 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -122,7 +122,11 @@ public class CameraUtil { // pressed the shutter button. public static final String ACTION_CAMERA_SHUTTER_CLICK = "com.android.camera.action.SHUTTER_CLICK"; - + public static final String INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE = + "android.media.action.STILL_IMAGE_CAMERA_SECURE"; + public static final String ACTION_IMAGE_CAPTURE_SECURE = + "android.media.action.IMAGE_CAPTURE_SECURE"; + public static final String SECURE_CAMERA_EXTRA = "secure_camera"; // Fields from android.hardware.Camera.Parameters public static final String FOCUS_MODE_CONTINUOUS_PICTURE = "continuous-picture"; public static final String RECORDING_HINT = "recording-hint"; |