diff options
17 files changed, 29 insertions, 33 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 201b565c5..2b43aa180 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -36,7 +36,6 @@ import android.graphics.BitmapFactory; import android.graphics.Matrix; import android.graphics.Point; import android.graphics.SurfaceTexture; -import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.hardware.Camera; import android.net.Uri; @@ -70,11 +69,10 @@ import android.widget.ImageView; import android.widget.ShareActionProvider; import com.android.camera.app.AppController; -import com.android.camera.app.CameraApp; import com.android.camera.app.CameraAppUI; import com.android.camera.app.CameraController; -import com.android.camera.app.CameraManager; -import com.android.camera.app.CameraManagerFactory; +import com.android.camera.cameradevice.CameraManager; +import com.android.camera.cameradevice.CameraManagerFactory; import com.android.camera.app.CameraProvider; import com.android.camera.app.CameraServices; import com.android.camera.app.LocationManager; diff --git a/src/com/android/camera/CameraErrorCallback.java b/src/com/android/camera/CameraErrorCallback.java index af855d140..187a3519e 100644 --- a/src/com/android/camera/CameraErrorCallback.java +++ b/src/com/android/camera/CameraErrorCallback.java @@ -16,7 +16,7 @@ package com.android.camera; -import com.android.camera.app.CameraManager; +import com.android.camera.cameradevice.CameraManager; import com.android.camera.debug.Log; public class CameraErrorCallback diff --git a/src/com/android/camera/CameraModule.java b/src/com/android/camera/CameraModule.java index 4abfe6bca..db23952e7 100644 --- a/src/com/android/camera/CameraModule.java +++ b/src/com/android/camera/CameraModule.java @@ -72,7 +72,7 @@ public abstract class CameraModule implements ModuleController { * This calls {@link * com.android.camera.app.CameraProvider#requestCamera(int)}. The camera * will be returned through {@link - * #onCameraAvailable(com.android.camera.app.CameraManager.CameraProxy)} + * #onCameraAvailable(com.android.camera.cameradevice.CameraManager.CameraProxy)} * when it's available. This is a no-op when there's no back camera * available. */ diff --git a/src/com/android/camera/CameraTestDevice.java b/src/com/android/camera/CameraTestDevice.java index a31580f56..ab9a114b9 100644 --- a/src/com/android/camera/CameraTestDevice.java +++ b/src/com/android/camera/CameraTestDevice.java @@ -18,7 +18,7 @@ package com.android.camera; import android.hardware.Camera.CameraInfo; -import com.android.camera.app.CameraManager.CameraProxy; +import com.android.camera.cameradevice.CameraManager.CameraProxy; /** * The class is kept to make sure the tests can build. diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index a9399d71e..517d75df4 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -50,11 +50,11 @@ import android.view.ViewGroup; import com.android.camera.PhotoModule.NamedImages.NamedEntity; import com.android.camera.app.AppController; import com.android.camera.app.CameraAppUI; -import com.android.camera.app.CameraManager.CameraAFCallback; -import com.android.camera.app.CameraManager.CameraAFMoveCallback; -import com.android.camera.app.CameraManager.CameraPictureCallback; -import com.android.camera.app.CameraManager.CameraProxy; -import com.android.camera.app.CameraManager.CameraShutterCallback; +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.app.LocationManager; import com.android.camera.app.MediaSaver; import com.android.camera.app.MemoryManager; diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index bdff1f2a8..1de6d0428 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -29,7 +29,7 @@ import android.view.View; import android.view.ViewGroup; import com.android.camera.FocusOverlayManager.FocusUI; -import com.android.camera.app.CameraManager; +import com.android.camera.cameradevice.CameraManager; import com.android.camera.debug.Log; import com.android.camera.ui.FaceView; import com.android.camera.ui.PreviewOverlay; diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 872134847..35b7400fb 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -54,9 +54,9 @@ import android.widget.Toast; import com.android.camera.app.AppController; import com.android.camera.app.CameraAppUI; -import com.android.camera.app.CameraManager; -import com.android.camera.app.CameraManager.CameraPictureCallback; -import com.android.camera.app.CameraManager.CameraProxy; +import com.android.camera.cameradevice.CameraManager; +import com.android.camera.cameradevice.CameraManager.CameraPictureCallback; +import com.android.camera.cameradevice.CameraManager.CameraProxy; import com.android.camera.app.LocationManager; import com.android.camera.app.MediaSaver; import com.android.camera.app.MemoryManager; diff --git a/src/com/android/camera/app/CameraController.java b/src/com/android/camera/app/CameraController.java index 560705a84..30c28e020 100644 --- a/src/com/android/camera/app/CameraController.java +++ b/src/com/android/camera/app/CameraController.java @@ -21,7 +21,8 @@ import android.hardware.Camera; import android.os.Handler; import com.android.camera.CameraDisabledException; -import com.android.camera.app.CameraManager.CameraExceptionCallback; +import com.android.camera.cameradevice.CameraManager; +import com.android.camera.cameradevice.CameraManager.CameraExceptionCallback; import com.android.camera.debug.Log; import com.android.camera.util.CameraUtil; diff --git a/src/com/android/camera/app/CameraProvider.java b/src/com/android/camera/app/CameraProvider.java index 54e26efb5..34bc67614 100644 --- a/src/com/android/camera/app/CameraProvider.java +++ b/src/com/android/camera/app/CameraProvider.java @@ -19,7 +19,7 @@ package com.android.camera.app; import android.hardware.Camera; import android.os.Handler; -import com.android.camera.app.CameraManager.CameraExceptionCallback; +import com.android.camera.cameradevice.CameraManager.CameraExceptionCallback; /** * An interface which defines the camera provider. diff --git a/src/com/android/camera/app/AndroidCameraManagerImpl.java b/src/com/android/camera/cameradevice/AndroidCameraManagerImpl.java index 6cd9c3581..cb6822b82 100644 --- a/src/com/android/camera/app/AndroidCameraManagerImpl.java +++ b/src/com/android/camera/cameradevice/AndroidCameraManagerImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.camera.app; +package com.android.camera.cameradevice; import android.annotation.TargetApi; import android.graphics.SurfaceTexture; diff --git a/src/com/android/camera/app/CameraManager.java b/src/com/android/camera/cameradevice/CameraManager.java index 6c295c8c2..560a21937 100644 --- a/src/com/android/camera/app/CameraManager.java +++ b/src/com/android/camera/cameradevice/CameraManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.camera.app; +package com.android.camera.cameradevice; import android.annotation.TargetApi; import android.graphics.SurfaceTexture; @@ -161,7 +161,7 @@ public interface CameraManager { * Opens the camera of the specified ID asynchronously. The camera device * will be opened in the camera handler thread and will be returned through * the {@link CameraManager.CameraOpenCallback# - * onCameraOpened(com.android.camera.app.CameraManager.CameraProxy)}. + * onCameraOpened(com.android.camera.cameradevice.CameraManager.CameraProxy)}. * * @param handler The {@link android.os.Handler} in which the callback * was handled. @@ -206,7 +206,7 @@ public interface CameraManager { /** * Reconnects to the camera device. On success, the camera device will * be returned through {@link CameraManager - * .CameraOpenCallback#onCameraOpened(com.android.camera.app.CameraManager + * .CameraOpenCallback#onCameraOpened(com.android.camera.cameradevice.CameraManager * .CameraProxy)}. * @see android.hardware.Camera#reconnect() * diff --git a/src/com/android/camera/app/CameraManagerFactory.java b/src/com/android/camera/cameradevice/CameraManagerFactory.java index e08ef78d6..5f1c39d27 100644 --- a/src/com/android/camera/app/CameraManagerFactory.java +++ b/src/com/android/camera/cameradevice/CameraManagerFactory.java @@ -14,10 +14,7 @@ * limitations under the License. */ -package com.android.camera.app; - -import com.android.camera.app.AndroidCameraManagerImpl; -import com.android.camera.app.CameraManager; +package com.android.camera.cameradevice; /** * A factory class for {@link CameraManager}. @@ -28,7 +25,7 @@ public class CameraManagerFactory { private static int sAndoridCameraManagerClientCount; /** - * Returns the android camera implementation of {@link com.android.camera.app.CameraManager}. + * Returns the android camera implementation of {@link com.android.camera.cameradevice.CameraManager}. * * @return The {@link CameraManager} to control the camera device. */ diff --git a/src/com/android/camera/debug/DebugCameraProxy.java b/src/com/android/camera/debug/DebugCameraProxy.java index 936ed8f3d..e2f14d243 100644 --- a/src/com/android/camera/debug/DebugCameraProxy.java +++ b/src/com/android/camera/debug/DebugCameraProxy.java @@ -21,10 +21,10 @@ import android.hardware.Camera; import android.os.Handler; import android.view.SurfaceHolder; -import com.android.camera.app.CameraManager; +import com.android.camera.cameradevice.CameraManager; /** - * A {@link com.android.camera.app.CameraManager.CameraProxy} which wraps the + * A {@link com.android.camera.cameradevice.CameraManager.CameraProxy} which wraps the * other and adds logs for all operations. */ public class DebugCameraProxy implements CameraManager.CameraProxy { diff --git a/src/com/android/camera/module/ModuleController.java b/src/com/android/camera/module/ModuleController.java index 49d8b6357..f47a27892 100644 --- a/src/com/android/camera/module/ModuleController.java +++ b/src/com/android/camera/module/ModuleController.java @@ -19,7 +19,7 @@ package com.android.camera.module; import com.android.camera.CameraActivity; import com.android.camera.ShutterButton; import com.android.camera.app.CameraAppUI.BottomBarUISpec; -import com.android.camera.app.CameraManager; +import com.android.camera.cameradevice.CameraManager; import com.android.camera.hardware.HardwareSpec; import com.android.camera.settings.SettingsManager; diff --git a/src/com/android/camera/settings/SettingsUtil.java b/src/com/android/camera/settings/SettingsUtil.java index c913190f8..c974a5fce 100644 --- a/src/com/android/camera/settings/SettingsUtil.java +++ b/src/com/android/camera/settings/SettingsUtil.java @@ -24,7 +24,7 @@ import android.hardware.Camera.Size; import android.media.CamcorderProfile; import android.util.SparseArray; -import com.android.camera.app.CameraManager; +import com.android.camera.cameradevice.CameraManager; import com.android.camera.debug.Log; import com.android.camera.settings.SettingsManager.SettingsCapabilities; import com.android.camera.util.Callback; diff --git a/src_pd/com/android/camera/util/SmartCameraHelper.java b/src_pd/com/android/camera/util/SmartCameraHelper.java index 43c0e8308..6f55a615b 100644 --- a/src_pd/com/android/camera/util/SmartCameraHelper.java +++ b/src_pd/com/android/camera/util/SmartCameraHelper.java @@ -20,7 +20,7 @@ import android.app.Activity; import android.hardware.Camera; import android.view.ViewGroup; -import com.android.camera.app.CameraManager.CameraProxy; +import com.android.camera.cameradevice.CameraManager.CameraProxy; public class SmartCameraHelper { public static void register(CameraProxy camera, Camera.Size previewSize, Activity activity, diff --git a/tests_camera/src/com/android/camera/activity/CameraTestCase.java b/tests_camera/src/com/android/camera/activity/CameraTestCase.java index 38d03e137..44a7139a4 100644 --- a/tests_camera/src/com/android/camera/activity/CameraTestCase.java +++ b/tests_camera/src/com/android/camera/activity/CameraTestCase.java @@ -30,7 +30,7 @@ import android.view.MotionEvent; import android.view.View; import com.android.camera.CameraTestDevice; -import com.android.camera.app.CameraManager.CameraProxy; +import com.android.camera.cameradevice.CameraManager.CameraProxy; import com.android.camera.util.CameraUtil; import com.android.gallery3d.R; |