Decouple OneCameraManager and CameraActivity.

1. To allow other activity (such as SettingsActivity) to
create OneCameraManager.

2. Also simplify OneCameraManager.open() and OneCameraCreator.create()
interface by introducing OneCameraCaptureSetting. From time to time,
we always need to change these interfaces if we want to pass in more
things to OneCamera. This solves the headache and also removes the
dependency between OneCameraCreator and SettingsManager.

Bug: 18523154
Change-Id: Ifb9077bb046740c600dab3b3b369a0f422dbbbeb

1 files changed, 14 insertions, 9 deletions

diff --git a/src_pd/com/android/camera/one/v2/OneCameraCreator.java b/src_pd/com/android/camera/one/v2/OneCameraCreator.java
index 248caa96e..acdc7a8ab 100644
--- a/src_pd/com/android/camera/one/v2/OneCameraCreator.java
+++ b/src_pd/com/android/camera/one/v2/OneCameraCreator.java
@@ -16,28 +16,33 @@
 
 package com.android.camera.one.v2;
 
+import android.content.Context;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraDevice;
 import android.util.DisplayMetrics;
 
 import com.android.camera.SoundPlayer;
-import com.android.camera.app.AppController;
 import com.android.camera.async.MainThread;
 import com.android.camera.burst.BurstFacade;
 import com.android.camera.one.OneCamera;
+import com.android.camera.one.OneCameraCaptureSetting;
 import com.android.camera.one.config.OneCameraFeatureConfig;
 import com.android.camera.one.v2.photo.ImageRotationCalculator;
 import com.android.camera.util.Size;
 
 public class OneCameraCreator {
-    public static OneCamera create(AppController context, boolean useHdr,
-            OneCameraFeatureConfig featureConfig, CameraDevice device,
-            CameraCharacteristics characteristics, Size pictureSize,
-            int maxMemoryMB, int maxImages,
-            DisplayMetrics displayMetrics, SoundPlayer soundPlayer,
-            MainThread mainThread, ImageRotationCalculator imageRotationCalculator,
-            BurstFacade burstController) {
+    public static OneCamera create(
+            CameraDevice device,
+            CameraCharacteristics characteristics,
+            OneCameraFeatureConfig featureConfig,
+            OneCameraCaptureSetting captureSetting,
+            DisplayMetrics displayMetrics,
+            Context context,
+            MainThread mainThread,
+            ImageRotationCalculator imageRotationCalculator,
+            BurstFacade burstController,
+            SoundPlayer soundPlayer) {
         // TODO: Might want to switch current camera to vendor HDR.
-        return new OneCameraImpl(device, characteristics, pictureSize);
+        return new OneCameraImpl(device, characteristics, captureSetting.getCaptureSize());
     }
 }