diff options
| author | Camera Software Integration <camswint@localhost> | 2016-11-15 07:05:39 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-15 07:05:39 -0800 |
| commit | c6fb74a0f63210f1991686e4303ed928b23e5b4b (patch) | |
| tree | 4e90933483450b4d50a3830437f06cf9dcb23f34 /src/com/android/camera/util | |
| parent | 835e1ab0df28156ade9d168ce5ce8b706765c44b (diff) | |
| parent | f5b99060843d791ece129463dcc5e377cd89c072 (diff) | |
| download | android_packages_apps_Snap-c6fb74a0f63210f1991686e4303ed928b23e5b4b.tar.gz android_packages_apps_Snap-c6fb74a0f63210f1991686e4303ed928b23e5b4b.tar.bz2 android_packages_apps_Snap-c6fb74a0f63210f1991686e4303ed928b23e5b4b.zip | |
Merge "SnapdragonCamera: Fix camera can`t enter setting in pattern lock" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/util')
| -rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 1dc5e558b..838f8d950 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -124,6 +124,8 @@ public class CameraUtil { /** Has to be in sync with the receiving MovieActivity. */ public static final String KEY_TREAT_UP_AS_BACK = "treat-up-as-back"; + /** Judge the value whether is from lockscreen come in or not */ + public static final String KEY_IS_SECURE_CAMERA = "is_secure_camera"; public static final int RATIO_UNKNOWN = 0; public static final int RATIO_16_9 = 1; |