This removes all non-Camera stuff from Camera2.

Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.

Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc

1 files changed, 8 insertions, 6 deletions

diff --git a/src/com/android/camera/CameraScreenNail.java b/src/com/android/camera/CameraScreenNail.java
index 993a7d336..9fe2c067a 100644
--- a/src/com/android/camera/CameraScreenNail.java
+++ b/src/com/android/camera/CameraScreenNail.java
@@ -16,16 +16,16 @@
 
 package com.android.camera;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.SurfaceTexture;
 import android.opengl.Matrix;
 import android.util.Log;
-
-import com.android.gallery3d.common.ApiHelper;
-import com.android.gallery3d.glrenderer.GLCanvas;
-import com.android.gallery3d.glrenderer.RawTexture;
-import com.android.gallery3d.ui.SurfaceTextureScreenNail;
+import com.android.camera.support.common.ApiHelper;
+import com.android.camera.support.glrenderer.GLCanvas;
+import com.android.camera.support.glrenderer.RawTexture;
+import com.android.camera.support.ui.SurfaceTextureScreenNail;
 
 /*
  * This is a ScreenNail which can display camera's preview.
@@ -313,11 +313,13 @@ public class CameraScreenNail extends SurfaceTextureScreenNail {
         Matrix.translateM(matrix, 0, -.5f, -.5f, 0);
     }
 
-    public void directDraw(GLCanvas canvas, int x, int y, int width, int height) {
+    @SuppressLint("WrongCall")
+	public void directDraw(GLCanvas canvas, int x, int y, int width, int height) {
         DrawClient draw;
         synchronized (mLock) {
             draw = mDraw;
         }
+        // TODO: Should this call draw or onDraw?
         draw.onDraw(canvas, x, y, width, height);
     }