diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-04 23:10:53 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-04 23:10:53 -0800 |
commit | 387dbe1e1e380729345aaf816ce84d73560067f4 (patch) | |
tree | c803313ed6c8631da60ba849282832af26fed801 /src/com/android/camera/VideoModule.java | |
parent | d2c7cc1b4f524a4221f417bc7fb3e2b70060f5a7 (diff) | |
parent | 48b9c1b568f88ad713b5d6ce76b6241f8b33a5de (diff) | |
download | android_packages_apps_Snap-387dbe1e1e380729345aaf816ce84d73560067f4.tar.gz android_packages_apps_Snap-387dbe1e1e380729345aaf816ce84d73560067f4.tar.bz2 android_packages_apps_Snap-387dbe1e1e380729345aaf816ce84d73560067f4.zip |
Merge "Camera2: Add See More feature in the menu"
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
-rwxr-xr-x | src/com/android/camera/VideoModule.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index cd2fae937..1600a1022 100755 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2028,6 +2028,15 @@ public class VideoModule implements CameraModule, } Log.d(TAG, "antiBanding value = " + mParameters.getAntibanding()); + String seeMoreMode = mPreferences.getString( + CameraSettings.KEY_SEE_MORE, + mActivity.getString(R.string.pref_camera_see_more_default)); + Log.v(TAG, "See More value =" + seeMoreMode); + if (isSupported(seeMoreMode, + CameraSettings.getSupportedSeeMoreModes(mParameters))) { + mParameters.set(CameraSettings.KEY_QC_SEE_MORE_MODE, seeMoreMode); + } + mUnsupportedHFRVideoSize = false; mUnsupportedHFRVideoCodec = false; mUnsupportedHSRVideoSize = false; |