diff options
| author | Likai Ding <likaid@codeaurora.org> | 2015-05-27 15:59:04 +0800 |
|---|---|---|
| committer | Likai Ding <likaid@codeaurora.org> | 2015-05-27 15:59:04 +0800 |
| commit | 36cfd9c72b8ed4ddce7625cc01641f2235bb473c (patch) | |
| tree | c9a702ba7b993116b1fd5329a9ee533a10a5aad5 /src/com/android/camera/PhotoMenu.java | |
| parent | da42b04ba6c0c3ec0b3f7e71ca5a277274443f89 (diff) | |
| download | android_packages_apps_Snap-36cfd9c72b8ed4ddce7625cc01641f2235bb473c.tar.gz android_packages_apps_Snap-36cfd9c72b8ed4ddce7625cc01641f2235bb473c.tar.bz2 android_packages_apps_Snap-36cfd9c72b8ed4ddce7625cc01641f2235bb473c.zip | |
SnapdragonCamera: implement optizoom and chromaflash UI
add scene mode for optizoom and preference entry for chromaflash
Change-Id: I859a42e3273d340a7dda7e24c6cb2e08ddb0f7bf
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index a70efdbad..b2ddc028a 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -179,6 +179,7 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_ISO, CameraSettings.KEY_EXPOSURE, CameraSettings.KEY_WHITE_BALANCE, + CameraSettings.KEY_QC_CHROMA_FLASH, CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_REDEYE_REDUCTION }; @@ -195,6 +196,7 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_ISO, CameraSettings.KEY_EXPOSURE, CameraSettings.KEY_WHITE_BALANCE, + CameraSettings.KEY_QC_CHROMA_FLASH, CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_REDEYE_REDUCTION, CameraSettings.KEY_AUTO_HDR, @@ -1370,6 +1372,17 @@ public class PhotoMenu extends MenuController mActivity.getString(R.string.pref_camera_advanced_feature_default)); } } + + String optizoomOn = mActivity.getString(R.string + .pref_camera_advanced_feature_value_optizoom_on); + if (notSame(pref, CameraSettings.KEY_SCENE_MODE, optizoomOn)) { + ListPreference lp = mPreferenceGroup + .findPreference(CameraSettings.KEY_ADVANCED_FEATURES); + if (lp != null && optizoomOn.equals(lp.getValue())) { + setPreference(CameraSettings.KEY_ADVANCED_FEATURES, + mActivity.getString(R.string.pref_camera_advanced_feature_default)); + } + } updateFilterModeIcon(pref, pref); super.onSettingChanged(pref); } |