diff options
| author | Santhosh Kumar Thimmanna Bhattar <sthim@codeaurora.org> | 2014-10-15 15:31:06 +0530 |
|---|---|---|
| committer | Santhosh Kumar Thimmanna Bhattar <sthim@codeaurora.org> | 2014-10-27 18:43:55 +0530 |
| commit | e6efb5bd958c5828fa93faacc8a3df120baf9126 (patch) | |
| tree | e3a3206a35760af76dc3cae18a9850250ebb9a19 /src/com/android/camera/PhotoMenu.java | |
| parent | 22795c20844cd3dae0e33e1dd4ef53766a4dd255 (diff) | |
| download | android_packages_apps_Snap-e6efb5bd958c5828fa93faacc8a3df120baf9126.tar.gz android_packages_apps_Snap-e6efb5bd958c5828fa93faacc8a3df120baf9126.tar.bz2 android_packages_apps_Snap-e6efb5bd958c5828fa93faacc8a3df120baf9126.zip | |
Camera2: Add Multi-touch UI and control in apps.
Changes to support multi-touch focus feature in application
Change-Id: I3dc0f3bf5cd71554856a00795e82d52f36066eeb
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 deeea89ee..2118af801 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -334,6 +334,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, @@ -352,7 +354,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); |