diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-09-10 15:08:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-09-10 15:08:29 -0700 |
| commit | 362f1194e769f30605b95bc78d24f6fd1064683e (patch) | |
| tree | f5f8c0d4d10579a2116bf95ec964c2d5e41e3e8a /src | |
| parent | 8326a45a80dac23f3821f38036a071c269527d8a (diff) | |
| parent | 0405e33f327e594260a165d04bf8bb07b9c29ba8 (diff) | |
| download | android_packages_apps_Snap-362f1194e769f30605b95bc78d24f6fd1064683e.tar.gz android_packages_apps_Snap-362f1194e769f30605b95bc78d24f6fd1064683e.tar.bz2 android_packages_apps_Snap-362f1194e769f30605b95bc78d24f6fd1064683e.zip | |
Merge "SnapdragonCamera: Always enable FD with TruePortrait on"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 50 |
1 files changed, 34 insertions, 16 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index c487aa1c7..b7a38dd09 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -3139,6 +3139,40 @@ public class PhotoModule stillMoreOff); } } + + if (mActivity.getString(R.string.pref_camera_advanced_feature_value_trueportrait_on) + .equals(advancedFeature)) { + // face detection must always be on for truePortrait + if (CameraUtil.isSupported(Parameters.FACE_DETECTION_ON, mParameters.getSupportedFaceDetectionModes())) { + mUI.overrideSettings(CameraSettings.KEY_FACE_DETECTION, Parameters.FACE_DETECTION_ON); + mParameters.setFaceDetectionMode(Parameters.FACE_DETECTION_ON); + if(mFaceDetectionEnabled == false) { + mFaceDetectionEnabled = true; + startFaceDetection(); + } + } + } else { + // Set face detetction parameter. + // clear override to re-enable setting if true portrait is off. + mUI.overrideSettings(CameraSettings.KEY_FACE_DETECTION, null); + + String faceDetection = mPreferences.getString( + CameraSettings.KEY_FACE_DETECTION, + mActivity.getString(R.string.pref_camera_facedetection_default)); + + if (CameraUtil.isSupported(faceDetection, mParameters.getSupportedFaceDetectionModes())) { + mParameters.setFaceDetectionMode(faceDetection); + if(faceDetection.equals("on") && mFaceDetectionEnabled == false) { + mFaceDetectionEnabled = true; + startFaceDetection(); + } + if(faceDetection.equals("off") && mFaceDetectionEnabled == true) { + stopFaceDetection(); + mFaceDetectionEnabled = false; + } + } + } + // Set auto exposure parameter. String autoExposure = mPreferences.getString( CameraSettings.KEY_AUTOEXPOSURE, @@ -3225,22 +3259,6 @@ public class PhotoModule mParameters.setFocusMode(mFocusManager.getFocusMode()); } } - // Set face detetction parameter. - String faceDetection = mPreferences.getString( - CameraSettings.KEY_FACE_DETECTION, - mActivity.getString(R.string.pref_camera_facedetection_default)); - - if (CameraUtil.isSupported(faceDetection, mParameters.getSupportedFaceDetectionModes())) { - mParameters.setFaceDetectionMode(faceDetection); - if(faceDetection.equals("on") && mFaceDetectionEnabled == false) { - mFaceDetectionEnabled = true; - startFaceDetection(); - } - if(faceDetection.equals("off") && mFaceDetectionEnabled == true) { - stopFaceDetection(); - mFaceDetectionEnabled = false; - } - } //Set Histogram String histogram = mPreferences.getString( |