diff options
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/camera/VideoMenu.java | 127 | ||||
-rw-r--r-- | src/com/android/camera/VideoModule.java | 30 |
2 files changed, 90 insertions, 67 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index c1a7d29ac..05e0a7c8e 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -667,9 +667,22 @@ public class VideoMenu extends MenuController } } + private void overridePreferenceAccessibility() { + overrideMenuForLocation(); + overrideMenuFor4K(); + overrideMenuForCDSMode(); + overrideMenuForSeeMore(); + } + + private void overrideMenuForLocation() { + if (mActivity.isSecureCamera()) { + // Prevent location preference from getting changed in secure camera + // mode + mListMenu.setPreferenceEnabled(CameraSettings.KEY_RECORD_LOCATION, false); + } + } private void overrideMenuFor4K() { - if(mListMenu != null && mUI.is4KEnabled()) - { + if(mUI.is4KEnabled()) { mListMenu.setPreferenceEnabled( CameraSettings.KEY_DIS,false); mListMenu.overrideSettings( @@ -682,59 +695,64 @@ public class VideoMenu extends MenuController } } - public void overrideCDSMode() { - if (mListMenu != null) { - ListPreference pref_tnr = mPreferenceGroup. - findPreference(CameraSettings.KEY_VIDEO_TNR_MODE); - ListPreference pref_cds = mPreferenceGroup. - findPreference(CameraSettings.KEY_VIDEO_CDS_MODE); - String tnr = (pref_tnr != null) ? pref_tnr.getValue() : null; - String cds = (pref_cds != null) ? pref_cds.getValue() : null; + private void overrideMenuForSeeMore() { + ListPreference pref_SeeMore = mPreferenceGroup.findPreference(CameraSettings.KEY_SEE_MORE); + if(pref_SeeMore != null && pref_SeeMore.getValue() != null + && pref_SeeMore.getValue().equals("on")) { + mListMenu.setPreferenceEnabled( + CameraSettings.KEY_VIDEO_CDS_MODE,false); + mListMenu.setPreferenceEnabled( + CameraSettings.KEY_VIDEO_TNR_MODE, false); + mListMenu.setPreferenceEnabled( + CameraSettings.KEY_NOISE_REDUCTION, false); + mListMenu.overrideSettings( + CameraSettings.KEY_VIDEO_CDS_MODE, + mActivity.getString(R.string.pref_camera_video_cds_value_off), + CameraSettings.KEY_VIDEO_TNR_MODE, + mActivity.getString(R.string.pref_camera_video_tnr_value_off), + CameraSettings.KEY_NOISE_REDUCTION, + mActivity.getString(R.string.pref_camera_noise_reduction_value_off)); + } + } - if (mPrevSavedVideoCDS == null && cds != null) { - mPrevSavedVideoCDS = cds; - } + private void overrideMenuForCDSMode() { - if ((tnr != null) && !mActivity.getString(R.string. - pref_camera_video_tnr_default).equals(tnr)) { - mListMenu.setPreferenceEnabled( - CameraSettings.KEY_VIDEO_CDS_MODE,false); - mListMenu.overrideSettings( - CameraSettings.KEY_VIDEO_CDS_MODE, - mActivity.getString(R.string.pref_camera_video_cds_value_off)); - mIsVideoTNREnabled = true; - if (!mIsVideoCDSUpdated) { - if (cds != null) { - mPrevSavedVideoCDS = cds; - } - mIsVideoCDSUpdated = true; - } - } else if (tnr != null) { - mListMenu.setPreferenceEnabled( - CameraSettings.KEY_VIDEO_CDS_MODE,true); - if (mIsVideoTNREnabled) { - mListMenu.overrideSettings( - CameraSettings.KEY_VIDEO_CDS_MODE, mPrevSavedVideoCDS); - mIsVideoTNREnabled = false; - mIsVideoCDSUpdated = false; + ListPreference pref_tnr = mPreferenceGroup. + findPreference(CameraSettings.KEY_VIDEO_TNR_MODE); + ListPreference pref_cds = mPreferenceGroup. + findPreference(CameraSettings.KEY_VIDEO_CDS_MODE); + String tnr = (pref_tnr != null) ? pref_tnr.getValue() : null; + String cds = (pref_cds != null) ? pref_cds.getValue() : null; + + if (mPrevSavedVideoCDS == null && cds != null) { + mPrevSavedVideoCDS = cds; + } + + if ((tnr != null) && !mActivity.getString(R.string. + pref_camera_video_tnr_default).equals(tnr)) { + mListMenu.setPreferenceEnabled( + CameraSettings.KEY_VIDEO_CDS_MODE,false); + mListMenu.overrideSettings( + CameraSettings.KEY_VIDEO_CDS_MODE, + mActivity.getString(R.string.pref_camera_video_cds_value_off)); + mIsVideoTNREnabled = true; + if (!mIsVideoCDSUpdated) { + if (cds != null) { + mPrevSavedVideoCDS = cds; } + mIsVideoCDSUpdated = true; } - - ListPreference pref_SeeMore = mPreferenceGroup.findPreference(CameraSettings.KEY_SEE_MORE); - if(pref_SeeMore != null && pref_SeeMore.getValue() != null - && pref_SeeMore.getValue().equals("on")) { - mListMenu.setPreferenceEnabled( - CameraSettings.KEY_VIDEO_CDS_MODE,false); - mListMenu.overrideSettings( - CameraSettings.KEY_VIDEO_CDS_MODE, - mActivity.getString(R.string.pref_camera_video_cds_value_off)); - mListMenu.setPreferenceEnabled( - CameraSettings.KEY_VIDEO_TNR_MODE, false); + } else if (tnr != null) { + mListMenu.setPreferenceEnabled( + CameraSettings.KEY_VIDEO_CDS_MODE,true); + if (mIsVideoTNREnabled) { mListMenu.overrideSettings( - CameraSettings.KEY_VIDEO_TNR_MODE, - mActivity.getString(R.string.pref_camera_video_tnr_value_off)); + CameraSettings.KEY_VIDEO_CDS_MODE, mPrevSavedVideoCDS); + mIsVideoTNREnabled = false; + mIsVideoCDSUpdated = false; } } + } @Override @@ -743,11 +761,9 @@ public class VideoMenu extends MenuController if (mListMenu == null) { initializePopup(); } else { - overrideCDSMode(); - overrideMenuFor4K(); + overridePreferenceAccessibility(); } mListMenu.overrideSettings(keyvalues); - } @Override @@ -768,15 +784,10 @@ public class VideoMenu extends MenuController if (mActivity.isDeveloperMenuEnabled()) keys = mOtherKeys2; popup1.initialize(mPreferenceGroup, keys); - if (mActivity.isSecureCamera()) { - // Prevent location preference from getting changed in secure camera - // mode - popup1.setPreferenceEnabled(CameraSettings.KEY_RECORD_LOCATION, false); - } + mListMenu = popup1; - overrideCDSMode(); - overrideMenuFor4K(); + overridePreferenceAccessibility(); } public void popupDismissed(boolean topPopupOnly) { diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 1bbe0204e..64cb814e9 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1959,9 +1959,9 @@ public class VideoModule implements CameraModule, if (!mPaused) mParameters = mCameraDevice.getParameters(); UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA, fail ? UsageStatistics.ACTION_CAPTURE_FAIL : - UsageStatistics.ACTION_CAPTURE_DONE, "Video", + UsageStatistics.ACTION_CAPTURE_DONE, "Video", mMediaRecorderPausing ? mRecordingTotalTime : - SystemClock.uptimeMillis() - mRecordingStartTime + mRecordingTotalTime); + SystemClock.uptimeMillis() - mRecordingStartTime + mRecordingTotalTime); mStopRecPending = false; return fail; } @@ -2313,7 +2313,7 @@ public class VideoModule implements CameraModule, pref_camera_video_tnr_value_off))) { mParameters.set(CameraSettings.KEY_QC_VIDEO_CDS_MODE, mActivity.getString(R.string.pref_camera_video_cds_value_off)); - mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_CDS_MODE, + mUI.overrideSettings(CameraSettings.KEY_VIDEO_CDS_MODE, mActivity.getString(R.string.pref_camera_video_cds_value_off)); if (!mIsVideoCDSUpdated) { if (video_cds != null) { @@ -2324,7 +2324,7 @@ public class VideoModule implements CameraModule, } } else if (mIsVideoTNREnabled) { mParameters.set(CameraSettings.KEY_QC_VIDEO_CDS_MODE, mPrevSavedVideoCDS); - mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_CDS_MODE, mPrevSavedVideoCDS); + mUI.overrideSettings(CameraSettings.KEY_VIDEO_CDS_MODE, mPrevSavedVideoCDS); mIsVideoTNREnabled = false; mIsVideoCDSUpdated = false; mOverrideCDS = true; @@ -2332,7 +2332,7 @@ public class VideoModule implements CameraModule, mTempVideoCDS = video_cds; } mParameters.set(CameraSettings.KEY_QC_VIDEO_TNR_MODE, video_tnr); - mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_TNR_MODE, video_tnr); + mUI.overrideSettings(CameraSettings.KEY_VIDEO_TNR_MODE, video_tnr); } String noiseReductionMode = mPreferences.getString( @@ -2349,7 +2349,7 @@ public class VideoModule implements CameraModule, pref_camera_video_cds_value_on))) { mParameters.set(CameraSettings.KEY_QC_VIDEO_CDS_MODE, mActivity.getString(R.string.pref_camera_video_cds_value_off)); - mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_CDS_MODE, + mUI.overrideSettings(CameraSettings.KEY_VIDEO_CDS_MODE, mActivity.getString(R.string.pref_camera_video_cds_value_off)); Toast.makeText(mActivity, R.string.disable_CDS_during_HighQualityNoiseReduction, Toast.LENGTH_LONG).show(); @@ -2362,7 +2362,7 @@ public class VideoModule implements CameraModule, pref_camera_video_tnr_value_on))) { mParameters.set(CameraSettings.KEY_QC_VIDEO_TNR_MODE, mActivity.getString(R.string.pref_camera_video_tnr_value_off)); - mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_TNR_MODE, + mUI.overrideSettings(CameraSettings.KEY_VIDEO_TNR_MODE, mActivity.getString(R.string.pref_camera_video_tnr_value_off)); Toast.makeText(mActivity, R.string.disable_TNR_during_HighQualityNoiseReduction, Toast.LENGTH_LONG).show(); @@ -2386,7 +2386,7 @@ public class VideoModule implements CameraModule, pref_camera_video_cds_value_on))) { mParameters.set(CameraSettings.KEY_QC_VIDEO_CDS_MODE, mActivity.getString(R.string.pref_camera_video_cds_value_off)); - mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_CDS_MODE, + mUI.overrideSettings(CameraSettings.KEY_VIDEO_CDS_MODE, mActivity.getString(R.string.pref_camera_video_cds_value_off)); Toast.makeText(mActivity, R.string.disable_CDS_during_SeeMore, Toast.LENGTH_LONG).show(); @@ -2399,12 +2399,24 @@ public class VideoModule implements CameraModule, pref_camera_video_tnr_value_on))) { mParameters.set(CameraSettings.KEY_QC_VIDEO_TNR_MODE, mActivity.getString(R.string.pref_camera_video_tnr_value_off)); - mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_TNR_MODE, + mUI.overrideSettings(CameraSettings.KEY_VIDEO_TNR_MODE, mActivity.getString(R.string.pref_camera_video_tnr_value_off)); Toast.makeText(mActivity, R.string.disable_TNR_during_SeeMore, Toast.LENGTH_LONG).show(); } + /* Disable NR */ + if (seeMoreMode.equals( + mActivity.getString(R.string.pref_camera_see_more_value_on)) && + !noiseReductionMode.equals(mActivity.getString(R.string. + pref_camera_noise_reduction_value_off))) { + mParameters.set(CameraSettings.KEY_QC_NOISE_REDUCTION_MODE, + mActivity.getString(R.string.pref_camera_noise_reduction_value_off)); + mUI.overrideSettings(CameraSettings.KEY_NOISE_REDUCTION, + mActivity.getString(R.string.pref_camera_noise_reduction_value_off)); + Toast.makeText(mActivity, R.string.disable_NR_during_SeeMore, + Toast.LENGTH_LONG).show(); + } /* Set SeeMore mode */ mParameters.set(CameraSettings.KEY_QC_SEE_MORE_MODE, seeMoreMode); } |