diff options
| author | Camera Software Integration <camswint@localhost> | 2016-06-07 22:48:31 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-07 22:48:31 -0700 |
| commit | e5775d32bd609c94ce3ecbe0ce541d4cf3611f2f (patch) | |
| tree | 247c7b7739d922f3d8bf4dccf233f69717eed575 /src/com/android/camera/PhotoMenu.java | |
| parent | 2c23961728e0fdcadcf7caee0dc14fa4dd6d208f (diff) | |
| parent | 0fdbb4a33a2deb480f877b904203c7f04ef507d0 (diff) | |
| download | android_packages_apps_Snap-e5775d32bd609c94ce3ecbe0ce541d4cf3611f2f.tar.gz android_packages_apps_Snap-e5775d32bd609c94ce3ecbe0ce541d4cf3611f2f.tar.bz2 android_packages_apps_Snap-e5775d32bd609c94ce3ecbe0ce541d4cf3611f2f.zip | |
Merge "SnapdragonCamera: Add SettingsManager, scene, and filter" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 46da31cfe..083b019c4 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -234,7 +234,7 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_MANUAL_EXPOSURE, CameraSettings.KEY_MANUAL_WB, CameraSettings.KEY_MANUAL_FOCUS, - CameraSettings.KEY_CAMERA2 + SettingsManager.KEY_CAMERA2 }; initSwitchItem(CameraSettings.KEY_CAMERA_ID, mFrontBackSwitcher); @@ -1469,17 +1469,9 @@ public class PhotoMenu extends MenuController updateFilterModeIcon(pref, pref); super.onSettingChanged(pref); - if (same(pref, CameraSettings.KEY_CAMERA2, "enable")) { - SharedPreferences prefs = PreferenceManager - .getDefaultSharedPreferences(mActivity); - prefs.edit().putBoolean(CameraSettings.KEY_CAMERA2, true).apply(); - CameraActivity.CAMERA_2_ON = true; + if (same(pref, SettingsManager.KEY_CAMERA2, "enable")) { mActivity.onModuleSelected(ModuleSwitcher.CAPTURE_MODULE_INDEX); - } else if (notSame(pref, CameraSettings.KEY_CAMERA2, "enable")) { - SharedPreferences prefs = PreferenceManager - .getDefaultSharedPreferences(mActivity); - prefs.edit().putBoolean(CameraSettings.KEY_CAMERA2, false).apply(); - CameraActivity.CAMERA_2_ON = false; + } else if (notSame(pref, SettingsManager.KEY_CAMERA2, "enable")) { mActivity.onModuleSelected(ModuleSwitcher.PHOTO_MODULE_INDEX); } } |