diff options
| author | Byunghun Jeon <bjeon@codeaurora.org> | 2015-11-17 14:20:30 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-25 21:55:20 -0700 |
| commit | 075630e6a853d472cb35e31cb7454596da1bfa0b (patch) | |
| tree | 42df9f8a368c216c6ef4923a2ec8f9af43f0fb4f /src/com/android/camera/PhotoMenu.java | |
| parent | 39b3dfdfc54fdcdf2ca8a65c4351043b9bb0f9d1 (diff) | |
| download | android_packages_apps_Snap-075630e6a853d472cb35e31cb7454596da1bfa0b.tar.gz android_packages_apps_Snap-075630e6a853d472cb35e31cb7454596da1bfa0b.tar.bz2 android_packages_apps_Snap-075630e6a853d472cb35e31cb7454596da1bfa0b.zip | |
SnapdragonCamera: Add Camera2 mode
Use camera2 API to show preview and take snapshot
CRs-Fixed: 989750
Change-Id: I07e2d6743529b3d3d5acecf667e9493465a094c9
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index db77b2c40..57fcf9092 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -48,6 +48,7 @@ import com.android.camera.ui.CameraRootView; import com.android.camera.ui.CountdownTimerPopup; import com.android.camera.ui.ListSubMenu; import com.android.camera.ui.ListMenu; +import com.android.camera.ui.ModuleSwitcher; import com.android.camera.ui.RotateLayout; import com.android.camera.ui.RotateImageView; import com.android.camera.ui.RotateTextToast; @@ -209,7 +210,8 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_AE_BRACKET_HDR, CameraSettings.KEY_MANUAL_EXPOSURE, CameraSettings.KEY_MANUAL_WB, - CameraSettings.KEY_MANUAL_FOCUS + CameraSettings.KEY_MANUAL_FOCUS, + CameraSettings.KEY_CAMERA2 }; initSwitchItem(CameraSettings.KEY_CAMERA_ID, mFrontBackSwitcher); @@ -1046,6 +1048,18 @@ public class PhotoMenu extends MenuController mPopupStatus = POPUP_FIRST_LEVEL; } + public void removeAllView() { + if (mUI != null) + mUI.removeLevel2(); + + if (mListMenu != null) { + mUI.dismissLevel1(); + mPopupStatus = POPUP_NONE; + } + closeSceneMode(); + mPreviewMenuStatus = PREVIEW_MENU_NONE; + } + public void closeAllView() { if (mUI != null) mUI.removeLevel2(); @@ -1190,6 +1204,19 @@ public class PhotoMenu extends MenuController } 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; + 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; + mActivity.onModuleSelected(ModuleSwitcher.PHOTO_MODULE_INDEX); + } } public int getOrientation() { |