diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-18 20:30:02 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-18 20:30:02 -0800 |
| commit | d917dde9ecd18dd6dd8f78bd6d4c89d417a90878 (patch) | |
| tree | 62e843ca41a94d90ee22e82f69f4e5815b4bc40e /src/com/android/camera/PhotoMenu.java | |
| parent | 7100c54b11bed6500a0b63310c190f8203180d6d (diff) | |
| parent | 762b4350b731e1c2189c871dc77627df2be87549 (diff) | |
| download | android_packages_apps_Snap-d917dde9ecd18dd6dd8f78bd6d4c89d417a90878.tar.gz android_packages_apps_Snap-d917dde9ecd18dd6dd8f78bd6d4c89d417a90878.tar.bz2 android_packages_apps_Snap-d917dde9ecd18dd6dd8f78bd6d4c89d417a90878.zip | |
Merge "SnapdragonCamera: implement refocus feature"
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index f4a4b36ce..d10a679b3 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -1103,6 +1103,17 @@ public class PhotoMenu extends MenuController } } + String refocusOn = mActivity.getString(R.string + .pref_camera_advanced_feature_value_refocus_on); + if (notSame(pref, CameraSettings.KEY_SCENE_MODE, refocusOn)) { + ListPreference lp = mPreferenceGroup + .findPreference(CameraSettings.KEY_ADVANCED_FEATURES); + if (lp != null && refocusOn.equals(lp.getValue())) { + setPreference(CameraSettings.KEY_ADVANCED_FEATURES, + mActivity.getString(R.string.pref_camera_advanced_feature_default)); + } + } + if (notSame(pref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO)) { buttonSetEnabled(mFilterModeSwitcher, false); } else { |