diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2014-01-20 20:40:32 +0200 |
---|---|---|
committer | Chippa-a <vusal1372@gmail.com> | 2019-10-25 15:55:25 +0300 |
commit | bfdc1037c805a57dc067a2084e6a20edacbf9e81 (patch) | |
tree | dce2ff16df48b7a0317e47b835b714b1c0177f4b /src/com/android/camera/CameraSettings.java | |
parent | f5fcd13376b152d2ddfa5860f49f1ac9d6eb096a (diff) | |
download | android_packages_apps_Snap-bfdc1037c805a57dc067a2084e6a20edacbf9e81.tar.gz android_packages_apps_Snap-bfdc1037c805a57dc067a2084e6a20edacbf9e81.tar.bz2 android_packages_apps_Snap-bfdc1037c805a57dc067a2084e6a20edacbf9e81.zip |
Camera: Powerkey shutter (2/2)
Ported from cm-10.1
Including cm-10.1 camera commit:
aa4ae80a41fbab763891c5ef6d67a9e5b4bb981b Don't mess around with pref local ID for power shutter initialization.
Includes http://review.cyanogenmod.org/56986
[mikeioannina]: Updates for L
Signed-off-by: Michael Bestas <mikeioannina@gmail.com>
Change-Id: I0992baa558eefd306d00fbece59cb5c512d9448b
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rwxr-xr-x | src/com/android/camera/CameraSettings.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 9dce35b6a..abad064d5 100755 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2009 The Android Open Source Project + * Copyright (C) 2013-2015 The CyanogenMod Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -81,6 +82,7 @@ public class CameraSettings { public static final String KEY_PHOTOSPHERE_PICTURESIZE = "pref_photosphere_picturesize_key"; public static final String KEY_STARTUP_MODULE_INDEX = "camera.startup_module"; + public static final String KEY_POWER_SHUTTER = "pref_power_shutter"; public static final String KEY_VIDEO_ENCODER = "pref_camera_videoencoder_key"; public static final String KEY_AUDIO_ENCODER = "pref_camera_audioencoder_key"; public static final String KEY_POWER_MODE = "pref_camera_powermode_key"; @@ -271,6 +273,8 @@ public class CameraSettings { public static final String KEY_SELFIE_FLASH = "pref_selfie_flash_key"; public static final String EXPOSURE_DEFAULT_VALUE = "0"; + public static final String VALUE_ON = "on"; + public static final String VALUE_OFF = "off"; public static final int CURRENT_VERSION = 5; public static final int CURRENT_LOCAL_VERSION = 2; |