From 1b30b78434547a368de2a918476e749db8dad96c Mon Sep 17 00:00:00 2001
From: Byunghun Jeon <bjeon@codeaurora.org>
Date: Wed, 10 Feb 2016 11:47:29 -0800
Subject: SnapdragonCamera: Camera2 add dual camera

Add Camera2 dual camera support to SnapdragonCamera

CRs-Fixed: 989750
Change-Id: I45a749ad03a531286a39cbfcfdcb65e5cad4759e
---
 src/com/android/camera/CaptureUI.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/com/android/camera/CaptureUI.java')

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();
-- 
cgit v1.2.3