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/ui | |
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/ui')
-rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 33 | ||||
-rw-r--r-- | src/com/android/camera/ui/ModuleSwitcher.java | 2 |
2 files changed, 34 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index 60240638c..1f9c8d921 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -37,6 +37,7 @@ import android.view.ViewGroup; import android.view.animation.DecelerateInterpolator; import android.widget.Scroller; +import com.android.camera.CaptureMenu; import com.android.camera.PhotoMenu; import com.android.camera.VideoMenu; import com.android.camera.PreviewGestures; @@ -1831,6 +1832,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { return true; PhotoMenu pMenu = mPreviewGestures.getPhotoMenu(); VideoMenu vMenu = mPreviewGestures.getVideoMenu(); + CaptureMenu cMenu = mPreviewGestures.getCaptureMenu(); if (pMenu != null) { if (pMenu.isMenuBeingShown()) { if (pMenu.isMenuBeingAnimated()) { @@ -1848,6 +1850,23 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { } } } + if (cMenu != null) { + if (cMenu.isMenuBeingShown()) { + if (cMenu.isMenuBeingAnimated()) { + if (cMenu.isOverMenu(ev)) { + mSendToMenu = true; + return true; + } + } + } + + if (cMenu.isPreviewMenuBeingShown()) { + if (cMenu.isOverPreviewMenu(ev)) { + mSendToPreviewMenu = true; + return true; + } + } + } if (vMenu != null) { if (vMenu.isMenuBeingShown()) { if (vMenu.isMenuBeingAnimated()) { @@ -1884,7 +1903,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { } PhotoMenu pMenu = mPreviewGestures.getPhotoMenu(); VideoMenu vMenu = mPreviewGestures.getVideoMenu(); - + CaptureMenu cMenu = mPreviewGestures.getCaptureMenu(); if (pMenu != null) { if (mSendToPreviewMenu) return pMenu.sendTouchToPreviewMenu(ev); @@ -1898,7 +1917,19 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { return pMenu.sendTouchToPreviewMenu(ev); } } + if (cMenu != null) { + if (mSendToPreviewMenu) + return cMenu.sendTouchToPreviewMenu(ev); + if (mSendToMenu) + return cMenu.sendTouchToMenu(ev); + if (cMenu.isMenuBeingShown()) { + return cMenu.sendTouchToMenu(ev); + } + if (cMenu.isPreviewMenuBeingShown()) { + return cMenu.sendTouchToPreviewMenu(ev); + } + } if (vMenu != null) { if (mSendToPreviewMenu) return vMenu.sendTouchToPreviewMenu(ev); diff --git a/src/com/android/camera/ui/ModuleSwitcher.java b/src/com/android/camera/ui/ModuleSwitcher.java index 217c92a54..189342a1b 100644 --- a/src/com/android/camera/ui/ModuleSwitcher.java +++ b/src/com/android/camera/ui/ModuleSwitcher.java @@ -52,6 +52,8 @@ public class ModuleSwitcher extends RotateImageView public static final int WIDE_ANGLE_PANO_MODULE_INDEX = 2; public static final int LIGHTCYCLE_MODULE_INDEX = 3; public static final int GCAM_MODULE_INDEX = 4; + public static final int CAPTURE_MODULE_INDEX = 5; + private boolean mTouchEnabled = true; private boolean mIsVisible = true; |