diff options
| author | Alok Kediya <kediya@codeaurora.org> | 2013-09-28 18:23:26 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:39:50 -0600 |
| commit | e57357e650a7fd65b9f8de3b64cdd0cd28f66b58 (patch) | |
| tree | e0ff80593886025cd7b013753142b77e8684bed5 /src/com/android/camera/VideoMenu.java | |
| parent | 6aebaa5e9af89581c5d07fef27c1a17e127673f9 (diff) | |
| download | android_packages_apps_Snap-e57357e650a7fd65b9f8de3b64cdd0cd28f66b58.tar.gz android_packages_apps_Snap-e57357e650a7fd65b9f8de3b64cdd0cd28f66b58.tar.bz2 android_packages_apps_Snap-e57357e650a7fd65b9f8de3b64cdd0cd28f66b58.zip | |
Camera: Add support for setting DIS
- This patch allows the CamCorder client to
configure DIS from the UI menu. Supported modes
by the camera are parsed and dynamically filtered.
(cherry picked from commit 24513b0af17e514aa24100c908432c115a1ddcda)
Change-Id: I7aaacc883eec9d1b91f549d8e76d96f4a6940aed
Conflicts:
src/com/android/camera/CameraSettings.java
(cherry picked from commit 1278c225500065e8448ad0ea2c6f50abefc5e884)
(cherry picked from commit e093b0988c3c4b5ece6ea7ad5f79796705cd4b21)
Diffstat (limited to 'src/com/android/camera/VideoMenu.java')
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 03196020c..01b9ddbc4 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -64,6 +64,7 @@ public class VideoMenu extends PieController PieItem item = null; // settings popup mOtherKeys1 = new String[] { + CameraSettings.KEY_DIS, CameraSettings.KEY_VIDEO_EFFECT, CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL, CameraSettings.KEY_VIDEO_QUALITY, |