Shared texture view in photosphere.

Change-Id: I8dd4898e3800b02fa7f0488104dcfa4600b3845f

1 files changed, 8 insertions, 26 deletions

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 236e4c382..a0e3f94d1 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -54,7 +54,6 @@ public class PhotoUI implements PreviewStatusListener,
     private final PhotoController mController;
 
     private final View mRootView;
-    private SurfaceTexture mSurfaceTexture;
 
     private FaceView mFaceView;
     private DecodeImageForReview mDecodeTaskForReview = null;
@@ -64,9 +63,7 @@ public class PhotoUI implements PreviewStatusListener,
 
     private int mPreviewWidth = 0;
     private int mPreviewHeight = 0;
-    private final TextureView mTextureView;
     private float mAspectRatio = UNSET;
-    private final Object mSurfaceTextureLock = new Object();
 
     private final GestureDetector.OnGestureListener mPreviewGestureListener
             = new GestureDetector.SimpleOnGestureListener() {
@@ -83,6 +80,11 @@ public class PhotoUI implements PreviewStatusListener,
     }
 
     @Override
+    public View.OnTouchListener getTouchListener() {
+        return null;
+    }
+
+    @Override
     public void onPreviewLayoutChanged(View v, int left, int top, int right,
             int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
         int width = right - left;
@@ -159,12 +161,8 @@ public class PhotoUI implements PreviewStatusListener,
         ViewGroup moduleRoot = (ViewGroup) mRootView.findViewById(R.id.module_layout);
         mActivity.getLayoutInflater().inflate(R.layout.photo_module,
                  moduleRoot, true);
-        // display the view
-        mTextureView = (TextureView) mRootView.findViewById(R.id.preview_content);
         initIndicators();
 
-        mSurfaceTexture = mTextureView.getSurfaceTexture();
-
         ViewStub faceViewStub = (ViewStub) mRootView
                 .findViewById(R.id.face_view_stub);
         if (faceViewStub != null) {
@@ -195,17 +193,9 @@ public class PhotoUI implements PreviewStatusListener,
         }
     }
 
-    protected Object getSurfaceTextureLock() {
-        return mSurfaceTextureLock;
-    }
-
     @Override
     public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        synchronized (mSurfaceTextureLock) {
-            Log.v(TAG, "SurfaceTexture ready.");
-            mSurfaceTexture = surface;
-            mController.onPreviewUIReady();
-        }
+        mController.onPreviewUIReady();
     }
 
     @Override
@@ -215,12 +205,8 @@ public class PhotoUI implements PreviewStatusListener,
 
     @Override
     public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
-        synchronized (mSurfaceTextureLock) {
-            mSurfaceTexture = null;
-            mController.onPreviewUIDestroyed();
-            Log.w(TAG, "SurfaceTexture destroyed");
-            return true;
-        }
+        mController.onPreviewUIDestroyed();
+        return true;
     }
 
     @Override
@@ -350,10 +336,6 @@ public class PhotoUI implements PreviewStatusListener,
         mActivity.setSwipingEnabled(enable);
     }
 
-    public SurfaceTexture getSurfaceTexture() {
-        return mSurfaceTexture;
-    }
-
     public void onPause() {
         if (mFaceView != null) mFaceView.clear();
     }