diff options
| author | Shwetha Kotekar <skotekar@codeaurora.org> | 2014-11-12 15:53:59 -0800 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-08-29 04:15:51 +0300 |
| commit | b3fc9fbab80e0191950cc4ffad5b626dc22dc8c3 (patch) | |
| tree | e73c4bcf7f2ab85f68c853b5bfd5ae0b91d6b7f9 | |
| parent | 55178e0f375c17c78181438b549c0cd3881e2178 (diff) | |
| download | android_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
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 15 |
2 files changed, 16 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 22f36f5f6..e2d627df5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -433,6 +433,9 @@ <!-- Toast after enable 2k4k video quality to inform IS has disabled --> <string name="video_quality_4k_disable_IS">Enable 4k video quality will disable IS.</string> + <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled --> + <string name="video_quality_4k_disable_SeeMore">SeeMore cannot be enabled during 4k video.</string> + <!-- Exposure settings in preference --> <string name="pref_exposure_title">Exposure</string> <string name="pref_exposure_default" translatable="false">0</string> 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; |