diff options
| author | Vladimir Petrov <vpetro@codeaurora.org> | 2014-07-14 18:32:12 -0700 |
|---|---|---|
| committer | Leena Winterrowd <lenhardw@codeaurora.org> | 2014-08-21 16:43:23 -0700 |
| commit | 3d8233a425e5f3e59f402fe3a14e672de1fb7d82 (patch) | |
| tree | c2c0756a3c0a63e0c8d7a7fc1812cc2db86305b2 /src/com/android/camera/CameraSettings.java | |
| parent | 759452b4bf1c28769fb1b151f0abb79331ce3f36 (diff) | |
| download | android_packages_apps_Snap-3d8233a425e5f3e59f402fe3a14e672de1fb7d82.tar.gz android_packages_apps_Snap-3d8233a425e5f3e59f402fe3a14e672de1fb7d82.tar.bz2 android_packages_apps_Snap-3d8233a425e5f3e59f402fe3a14e672de1fb7d82.zip | |
SnapdragonCamera: Fix improper call to disable HFR
- Remove the filter for unsupported HFR modes in camcorder
(may re-introduce CR#510215)
- Fix improperly hardcoded setting of HFR mode to "disable"
instead of "off"
- Revert code where string prefixes were added to HFR camera
parameter
This reverts commit 1ad1d65a88e350e6e5461828ab930638b778564d.
This reverts commit 9804a5e9116c8e17ac11449fcd83f2e0af5d4f38.
CRs-Fixed: 687765
Change-Id: I85eecca7f2fc9bd83e90e0610ab66f1102dedc02
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 3a87652df..2803dbe1b 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -127,6 +127,7 @@ public class CameraSettings { public static final String KEY_QC_FACE_RECOGNITION = "face-recognition"; public static final String KEY_QC_DIS_MODE = "dis"; public static final String KEY_SNAPCAM_HDR_MODE = "hdr-mode"; + public static final String KEY_VIDEO_HSR = "video-hsr"; public static final String KEY_INTERNAL_PREVIEW_RESTART = "internal-restart"; public static final String KEY_QC_ZSL_HDR_SUPPORTED = "zsl-hdr-supported"; @@ -375,7 +376,6 @@ public class CameraSettings { ListPreference videoSnapSize = group.findPreference(KEY_VIDEO_SNAPSHOT_SIZE); ListPreference videoHdr = group.findPreference(KEY_VIDEO_HDR); ListPreference pictureFormat = group.findPreference(KEY_PICTURE_FORMAT); - ListPreference hfr = group.findPreference(KEY_VIDEO_HIGH_FRAME_RATE); ListPreference longShot = group.findPreference(KEY_LONGSHOT); ListPreference auto_hdr = group.findPreference(KEY_AUTO_HDR); ListPreference hdr_mode = group.findPreference(KEY_HDR_MODE); @@ -470,6 +470,7 @@ public class CameraSettings { removePreference(group, longShot.getKey()); } } + private void initPreference(PreferenceGroup group) { ListPreference videoQuality = group.findPreference(KEY_VIDEO_QUALITY); ListPreference timeLapseInterval = group.findPreference(KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL); |