diff options
| author | Sol Boucher <solb@google.com> | 2014-06-17 14:05:08 -0700 |
|---|---|---|
| committer | Sol Boucher <solb@google.com> | 2014-06-18 11:31:53 -0700 |
| commit | 5a344964cb003525727c31d295ca3a592c245606 (patch) | |
| tree | 74cb5248f99ae56cfce68a39eca734973d74f56a /src/com/android/camera/PhotoUI.java | |
| parent | 1ec930eb7cc0ef2b02e997833b712bd8b768bdf9 (diff) | |
| download | android_packages_apps_Camera2-5a344964cb003525727c31d295ca3a592c245606.tar.gz android_packages_apps_Camera2-5a344964cb003525727c31d295ca3a592c245606.tar.bz2 android_packages_apps_Camera2-5a344964cb003525727c31d295ca3a592c245606.zip | |
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
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 4b087d5d6..08f7536b2 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -34,9 +34,6 @@ import android.widget.FrameLayout; import android.widget.ImageView; import com.android.camera.FocusOverlayManager.FocusUI; -import com.android.camera.cameradevice.CameraCapabilities; -import com.android.camera.cameradevice.CameraManager; -import com.android.camera.cameradevice.CameraSettings; import com.android.camera.debug.Log; import com.android.camera.ui.CountDownView; import com.android.camera.ui.FaceView; @@ -47,11 +44,14 @@ import com.android.camera.widget.AspectRatioDialogLayout; import com.android.camera.widget.AspectRatioSelector; import com.android.camera.widget.LocationDialogLayout; 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.CameraSettings; import java.util.List; public class PhotoUI implements PreviewStatusListener, - CameraManager.CameraFaceDetectionCallback, PreviewStatusListener.PreviewAreaChangedListener { + CameraAgent.CameraFaceDetectionCallback, PreviewStatusListener.PreviewAreaChangedListener { private static final Log.Tag TAG = new Log.Tag("PhotoUI"); private static final int DOWN_SAMPLE_FACTOR = 4; @@ -561,7 +561,7 @@ public class PhotoUI implements PreviewStatusListener, } @Override - public void onFaceDetection(Face[] faces, CameraManager.CameraProxy camera) { + public void onFaceDetection(Face[] faces, CameraAgent.CameraProxy camera) { if (mFaceView != null) { mFaceView.setFaces(faces); } |