diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-04-11 20:19:24 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-04-11 20:19:24 -0700 |
| commit | 5cbd6a24087cfab51709e847ee18f2551b1744f1 (patch) | |
| tree | 5e38cebd136ff7878d088caad6d65add6bca8ec7 /src/com/android/camera/CameraSettings.java | |
| parent | 84639727a46d6bfd438617e91bd278aaaa193717 (diff) | |
| parent | 2cd5731c010b21df1f441afac307b084b7356e95 (diff) | |
| download | android_packages_apps_Snap-5cbd6a24087cfab51709e847ee18f2551b1744f1.tar.gz android_packages_apps_Snap-5cbd6a24087cfab51709e847ee18f2551b1744f1.tar.bz2 android_packages_apps_Snap-5cbd6a24087cfab51709e847ee18f2551b1744f1.zip | |
Merge "Camera: Remove HFR option if it is not supported"
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index b49f2a066..c6fad5ca0 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -452,9 +452,16 @@ public class CameraSettings { ListPreference cameraHdr = group.findPreference(KEY_CAMERA_HDR); ListPreference disMode = group.findPreference(KEY_DIS); ListPreference cameraHdrPlus = group.findPreference(KEY_CAMERA_HDR_PLUS); + ListPreference videoHfrMode = + group.findPreference(KEY_VIDEO_HIGH_FRAME_RATE); // Since the screen could be loaded from different resources, we need // to check if the preference is available here + if ((videoHfrMode != null) && + (mParameters.getSupportedHfrSizes() == null)) { + filterUnsupportedOptions(group, videoHfrMode, null); + } + if (videoQuality != null) { filterUnsupportedOptions(group, videoQuality, getSupportedVideoQuality( mCameraId,mParameters)); |