diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-02-10 11:47:29 -0800 |
---|---|---|
committer | Jay Wang <jaywang@codeaurora.org> | 2016-03-30 15:54:49 -0700 |
commit | 1b30b78434547a368de2a918476e749db8dad96c (patch) | |
tree | 1598bd5094425c582ebd9da4f5a8e3d8a2d9d16c /src/com/android/camera/CaptureUI.java | |
parent | 3618eb79912c36216b197580e54e366ab19d2a61 (diff) | |
download | android_packages_apps_Snap-1b30b78434547a368de2a918476e749db8dad96c.tar.gz android_packages_apps_Snap-1b30b78434547a368de2a918476e749db8dad96c.tar.bz2 android_packages_apps_Snap-1b30b78434547a368de2a918476e749db8dad96c.zip |
SnapdragonCamera: Camera2 add dual camera
Add Camera2 dual camera support to SnapdragonCamera
CRs-Fixed: 989750
Change-Id: I45a749ad03a531286a39cbfcfdcb65e5cad4759e
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rw-r--r-- | src/com/android/camera/CaptureUI.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index 9095cd188..97db3ac46 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -189,16 +189,12 @@ public class CaptureUI implements PieListener, mPreviewCover = mRootView.findViewById(R.id.preview_cover); // display the view mSurfaceView = (SurfaceView) mRootView.findViewById(R.id.mdp_preview_content); - mSurfaceView.setVisibility(View.VISIBLE); mSurfaceView2 = (SurfaceView) mRootView.findViewById(R.id.mdp_preview_content2); - //mSurfaceView2.setVisibility(View.VISIBLE); + mSurfaceView2.setZOrderMediaOverlay(true); mSurfaceHolder = mSurfaceView.getHolder(); mSurfaceHolder.addCallback(this); - //mSurfaceHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS); mSurfaceHolder2 = mSurfaceView2.getHolder(); mSurfaceHolder2.addCallback(callback); - //mSurfaceHolder2.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS); - mSurfaceView.addOnLayoutChangeListener(mLayoutListener); Log.v(TAG, "Using mdp_preview_content (MDP path)"); mRenderOverlay = (RenderOverlay) mRootView.findViewById(R.id.render_overlay); @@ -671,6 +667,14 @@ public class CaptureUI implements PieListener, } } + public void hideSurfaceView() { + mSurfaceView.setVisibility(View.INVISIBLE); + } + + public void showSurfaceView() { + mSurfaceView.setVisibility(View.VISIBLE); + } + public void onPause() { // Clear UI. collapseCameraControls(); @@ -689,6 +693,10 @@ public class CaptureUI implements PieListener, public void clearFaces() { } + public void setPreference(String key, String value) { + mMenu.setPreference(key, value); + } + @Override public void clearFocus() { FocusIndicator indicator = getFocusIndicator(); |