commit 5a344964cb003525727c31d295ca3a592c245606
author Sol Boucher <solb@google.com> Tue Jun 17 14:05:08 2014 -0700
committer Sol Boucher <solb@google.com> Wed Jun 18 11:31:53 2014 -0700
tree 74cb5248f99ae56cfce68a39eca734973d74f56a
parent 1ec930eb7cc0ef2b02e997833b712bd8b768bdf9

Remove cameradevice subpackage and point references at ex library

This code is being relocated into frameworks/ex for availability to other apps.

Change-Id: Icada261ac7a795b08dd8b187dfd17077077b37c3

src/com/android/camera/PhotoModule.java

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index a35a1dd..7034693 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -57,15 +57,6 @@
 import com.android.camera.app.MemoryManager;
 import com.android.camera.app.MemoryManager.MemoryListener;
 import com.android.camera.app.MotionManager;
-import com.android.camera.cameradevice.CameraCapabilities;
-import com.android.camera.cameradevice.CameraManager;
-import com.android.camera.cameradevice.CameraManager.CameraAFCallback;
-import com.android.camera.cameradevice.CameraManager.CameraAFMoveCallback;
-import com.android.camera.cameradevice.CameraManager.CameraPictureCallback;
-import com.android.camera.cameradevice.CameraManager.CameraProxy;
-import com.android.camera.cameradevice.CameraManager.CameraShutterCallback;
-import com.android.camera.cameradevice.CameraSettings;
-import com.android.camera.cameradevice.Size;
 import com.android.camera.debug.Log;
 import com.android.camera.exif.ExifInterface;
 import com.android.camera.exif.ExifTag;
@@ -86,6 +77,15 @@
 import com.android.camera.util.UsageStatistics;
 import com.android.camera.widget.AspectRatioSelector;
 import com.android.camera2.R;
+import com.android.ex.camera2.portability.CameraCapabilities;
+import com.android.ex.camera2.portability.CameraAgent;
+import com.android.ex.camera2.portability.CameraAgent.CameraAFCallback;
+import com.android.ex.camera2.portability.CameraAgent.CameraAFMoveCallback;
+import com.android.ex.camera2.portability.CameraAgent.CameraPictureCallback;
+import com.android.ex.camera2.portability.CameraAgent.CameraProxy;
+import com.android.ex.camera2.portability.CameraAgent.CameraShutterCallback;
+import com.android.ex.camera2.portability.CameraSettings;
+import com.android.ex.camera2.portability.Size;
 import com.google.common.logging.eventprotos;
 
 import java.io.ByteArrayOutputStream;