diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2014-01-20 20:40:32 +0200 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:22:26 -0700 |
| commit | 85c301a49187a33e766766591a1a1de97377608a (patch) | |
| tree | 1c41846bd79618b34f9851c59dc176714ad8be51 /src/com/android/camera/VideoMenu.java | |
| parent | 032c6038f5206de8ea28ecaebe4c62b04367f91e (diff) | |
| download | android_packages_apps_Snap-85c301a49187a33e766766591a1a1de97377608a.tar.gz android_packages_apps_Snap-85c301a49187a33e766766591a1a1de97377608a.tar.bz2 android_packages_apps_Snap-85c301a49187a33e766766591a1a1de97377608a.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/VideoMenu.java')
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index f04989d0b..7af839bb7 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 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. @@ -117,7 +118,8 @@ public class VideoMenu extends MenuController CameraSettings.KEY_EXPOSURE, CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, - CameraSettings.KEY_DIS + CameraSettings.KEY_DIS, + CameraSettings.KEY_POWER_SHUTTER }; mOtherKeys2 = new String[] { CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, @@ -128,6 +130,7 @@ public class VideoMenu extends MenuController CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_FACE_DETECTION, CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, + CameraSettings.KEY_POWER_SHUTTER, CameraSettings.KEY_SEE_MORE, CameraSettings.KEY_NOISE_REDUCTION, CameraSettings.KEY_DIS, |