summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorShwetha Kotekar <skotekar@codeaurora.org>2015-03-10 13:35:49 -0700
committerShwetha Kotekar <skotekar@codeaurora.org>2015-03-10 13:35:49 -0700
commit08f34cd0d9f835ad9c7ec524de740b7710b483f1 (patch)
tree2f78458cbde779947e866c5e12e0a084136b1c50 /src
parent20248ae170d8bf7357b6f0bfe3d3bdb068c3af88 (diff)
downloadandroid_packages_apps_Snap-08f34cd0d9f835ad9c7ec524de740b7710b483f1.tar.gz
android_packages_apps_Snap-08f34cd0d9f835ad9c7ec524de740b7710b483f1.tar.bz2
android_packages_apps_Snap-08f34cd0d9f835ad9c7ec524de740b7710b483f1.zip
Camera2: Disable SeeMore feature during 4K video
If the video resoultion is 4K, disable SeeMore and show a toast message. Change-Id: Ica6d5cf0e24154556fcdf44df9172ca255fe030a
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/VideoModule.java15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 6e3198390..42268e9e3 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -2067,9 +2067,20 @@ public class VideoModule implements CameraModule,
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);
+ CameraSettings.getSupportedSeeMoreModes(mParameters))) {
+ if (is4KEnabled() && seeMoreMode.equals(mActivity.getString(R.string.
+ pref_camera_see_more_value_on))) {
+ mParameters.set(CameraSettings.KEY_QC_SEE_MORE_MODE,
+ mActivity.getString(R.string.pref_camera_see_more_value_off));
+ mUI.overrideSettings(CameraSettings.KEY_SEE_MORE,
+ mActivity.getString(R.string.pref_camera_see_more_value_off));
+ Toast.makeText(mActivity, R.string.video_quality_4k_disable_SeeMore,
+ Toast.LENGTH_LONG).show();
+ } else {
+ mParameters.set(CameraSettings.KEY_QC_SEE_MORE_MODE, seeMoreMode);
+ }
}
mUnsupportedHFRVideoSize = false;