diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-04 23:10:55 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-04 23:10:55 -0800 |
| commit | dd9c64b75696afd887307160d2140a6ac0e2c8a6 (patch) | |
| tree | d51dbbd6524b1ae9d0f389c846b26d91c717cae3 /src/com/android/camera/PhotoMenu.java | |
| parent | 9a306f7ccf3974ff4dbed40b1131529a64c7ee05 (diff) | |
| parent | e6efb5bd958c5828fa93faacc8a3df120baf9126 (diff) | |
| download | android_packages_apps_Snap-dd9c64b75696afd887307160d2140a6ac0e2c8a6.tar.gz android_packages_apps_Snap-dd9c64b75696afd887307160d2140a6ac0e2c8a6.tar.bz2 android_packages_apps_Snap-dd9c64b75696afd887307160d2140a6ac0e2c8a6.zip | |
Merge "Camera2: Add Multi-touch UI and control in apps."
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 5743312aa..0d4643bf7 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -335,6 +335,8 @@ public class PhotoMenu extends PieController pref_camera_advanced_feature_value_FSSR_on); String truePortraitOn = mActivity.getString(R.string. pref_camera_advanced_feature_value_trueportrait_on); + String multiTouchFocusOn = mActivity.getString(R.string. + pref_camera_advanced_feature_value_multi_touch_focus_on); if ((zsl != null) && Parameters.ZSL_OFF.equals(zsl)) { popup3.overrideSettings(CameraSettings.KEY_ADVANCED_FEATURES, @@ -353,7 +355,8 @@ public class PhotoMenu extends PieController advancedFeatures.equals(reFocusOn) || advancedFeatures.equals(optiZoomOn) || advancedFeatures.equals(fssrOn) || - advancedFeatures.equals(truePortraitOn))) { + advancedFeatures.equals(truePortraitOn) || + advancedFeatures.equals(multiTouchFocusOn))) { popup3.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false); popup3.setPreferenceEnabled(CameraSettings.KEY_FLASH_MODE,false); popup3.setPreferenceEnabled(CameraSettings.KEY_AE_BRACKET_HDR,false); |