diff options
| author | Byunghun Jeon <bjeon@codeaurora.org> | 2015-11-17 14:20:30 -0800 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-03-30 15:54:11 -0700 |
| commit | 3618eb79912c36216b197580e54e366ab19d2a61 (patch) | |
| tree | d3157d73b7a15382a5562e25e6cb72f073228835 /src/com/android/camera/PhotoMenu.java | |
| parent | bdabec40fc13076c07fba8bb5d04a104cab2ddce (diff) | |
| download | android_packages_apps_Snap-3618eb79912c36216b197580e54e366ab19d2a61.tar.gz android_packages_apps_Snap-3618eb79912c36216b197580e54e366ab19d2a61.tar.bz2 android_packages_apps_Snap-3618eb79912c36216b197580e54e366ab19d2a61.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 | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 225a8fe05..b3c6117fa 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -54,6 +54,7 @@ import com.android.camera.ui.CameraControls; 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; @@ -230,7 +231,8 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_INSTANT_CAPTURE, 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); @@ -1290,7 +1292,6 @@ public class PhotoMenu extends MenuController privateCounter = 0; } } - LayoutInflater inflater = (LayoutInflater) mActivity.getSystemService( Context.LAYOUT_INFLATER_SERVICE); ListSubMenu basic = (ListSubMenu) inflater.inflate( @@ -1313,6 +1314,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(); @@ -1452,6 +1465,19 @@ 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; + 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() { |