diff options
| author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-09-06 10:00:35 -0700 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-09-27 10:44:23 -0700 |
| commit | 8eefd5866870e7293665df25625ab69fb8e2de0f (patch) | |
| tree | 528c75c6f2f331806c2bda2839ebe35a4af3537b /src/com/android/camera/PhotoMenu.java | |
| parent | acc281b545f5651aa094ceeeb219bc181a168a21 (diff) | |
| download | android_packages_apps_Snap-8eefd5866870e7293665df25625ab69fb8e2de0f.tar.gz android_packages_apps_Snap-8eefd5866870e7293665df25625ab69fb8e2de0f.tar.bz2 android_packages_apps_Snap-8eefd5866870e7293665df25625ab69fb8e2de0f.zip | |
SnapdragonCamera: Use persist to set Camera1/Camera2 mode
Use persist flag to choose camera1 or camera2.
Flag is persist.camera.camera2
Default will be camera1
Change-Id: Ic616b3d4b9f1293e45c7a006587f5c9ba34a0687
CRs-Fixed: 1066444
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r--[-rwxr-xr-x] | src/com/android/camera/PhotoMenu.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index dca66d1cb..2da33ebbd 100755..100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -237,8 +237,7 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_MANUAL_WB, CameraSettings.KEY_MANUAL_FOCUS, CameraSettings.KEY_SELFIE_MIRROR, - CameraSettings.KEY_SHUTTER_SOUND, - SettingsManager.KEY_CAMERA2 + CameraSettings.KEY_SHUTTER_SOUND }; initSwitchItem(CameraSettings.KEY_CAMERA_ID, mFrontBackSwitcher); @@ -1502,11 +1501,6 @@ public class PhotoMenu extends MenuController } super.onSettingChanged(pref); - if (same(pref, SettingsManager.KEY_CAMERA2, "enable")) { - mActivity.onModuleSelected(ModuleSwitcher.CAPTURE_MODULE_INDEX); - } else if (notSame(pref, SettingsManager.KEY_CAMERA2, "enable")) { - mActivity.onModuleSelected(ModuleSwitcher.PHOTO_MODULE_INDEX); - } } public int getOrientation() { |