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

5 files changed, 8 insertions, 8 deletions

diff --git a/src/com/android/camera/settings/CameraPictureSizesCacher.java b/src/com/android/camera/settings/CameraPictureSizesCacher.java
index 6e0f23fb4..6f0c86e8a 100644
--- a/src/com/android/camera/settings/CameraPictureSizesCacher.java
+++ b/src/com/android/camera/settings/CameraPictureSizesCacher.java
@@ -22,7 +22,7 @@ import android.hardware.Camera;
 import android.os.Build;
 import android.preference.PreferenceManager;
 
-import com.android.camera.cameradevice.Size;
+import com.android.ex.camera2.portability.Size;
 
 import java.util.List;
 
diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java
index 43bbfcf32..3a7e92979 100644
--- a/src/com/android/camera/settings/CameraSettingsActivity.java
+++ b/src/com/android/camera/settings/CameraSettingsActivity.java
@@ -46,8 +46,8 @@ import com.android.camera.settings.SettingsUtil.SelectedVideoQualities;
 import com.android.camera.util.FeedbackHelper;
 import com.android.camera.util.GoogleHelpHelper;
 import com.android.camera.util.SettingsHelper;
-import com.android.camera.cameradevice.Size;
 import com.android.camera2.R;
+import com.android.ex.camera2.portability.Size;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
diff --git a/src/com/android/camera/settings/ResolutionUtil.java b/src/com/android/camera/settings/ResolutionUtil.java
index c81b36c93..9ddb45c70 100644
--- a/src/com/android/camera/settings/ResolutionUtil.java
+++ b/src/com/android/camera/settings/ResolutionUtil.java
@@ -17,7 +17,7 @@
 package com.android.camera.settings;
 
 import com.android.camera.util.ApiHelper;
-import com.android.camera.cameradevice.Size;
+import com.android.ex.camera2.portability.Size;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
diff --git a/src/com/android/camera/settings/SettingsManager.java b/src/com/android/camera/settings/SettingsManager.java
index fd47ed80b..c825eb6f1 100644
--- a/src/com/android/camera/settings/SettingsManager.java
+++ b/src/com/android/camera/settings/SettingsManager.java
@@ -29,8 +29,8 @@ import com.android.camera.app.LocationManager;
 import com.android.camera.debug.Log;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.SettingsHelper;
-import com.android.camera.cameradevice.Size;
 import com.android.camera2.R;
+import com.android.ex.camera2.portability.Size;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/camera/settings/SettingsUtil.java b/src/com/android/camera/settings/SettingsUtil.java
index d559fa55e..166300861 100644
--- a/src/com/android/camera/settings/SettingsUtil.java
+++ b/src/com/android/camera/settings/SettingsUtil.java
@@ -23,13 +23,13 @@ import android.hardware.Camera.Parameters;
 import android.media.CamcorderProfile;
 import android.util.SparseArray;
 
-import com.android.camera.cameradevice.CameraManager;
-import com.android.camera.cameradevice.CameraSettings;
 import com.android.camera.debug.Log;
 import com.android.camera.settings.SettingsManager.SettingsCapabilities;
 import com.android.camera.util.Callback;
-import com.android.camera.cameradevice.Size;
 import com.android.camera2.R;
+import com.android.ex.camera2.portability.CameraAgent;
+import com.android.ex.camera2.portability.CameraSettings;
+import com.android.ex.camera2.portability.Size;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -406,7 +406,7 @@ public class SettingsUtil {
      * Determines and returns the capabilities of the given camera.
      */
     public static SettingsCapabilities
-            getSettingsCapabilities(CameraManager.CameraProxy camera) {
+            getSettingsCapabilities(CameraAgent.CameraProxy camera) {
         final Parameters parameters = camera.getParameters();
         return (new SettingsCapabilities() {
             @Override