summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorShwetha Kotekar <skotekar@codeaurora.org>2014-11-12 15:53:59 -0800
committerMichael Bestas <mikeioannina@gmail.com>2015-08-29 04:15:51 +0300
commitb3fc9fbab80e0191950cc4ffad5b626dc22dc8c3 (patch)
treee73c4bcf7f2ab85f68c853b5bfd5ae0b91d6b7f9 /src
parent55178e0f375c17c78181438b549c0cd3881e2178 (diff)
downloadandroid_packages_apps_Snap-b3fc9fbab80e0191950cc4ffad5b626dc22dc8c3.tar.gz
android_packages_apps_Snap-b3fc9fbab80e0191950cc4ffad5b626dc22dc8c3.tar.bz2
android_packages_apps_Snap-b3fc9fbab80e0191950cc4ffad5b626dc22dc8c3.zip
Camera2: Disable SeeMore feature during 4K video
If the video resoultion is 4K, disable SeeMore and show a toast message Change-Id: Ieb947f889d92fb8f9af5bf52c865555dce7eb1c4
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 9abf539fc..2acb7eee1 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -2071,9 +2071,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;