OneCameraOpener should inform ActiveCameraDeviceTracker about camera open.

Therefore, people use OneCameraOpener to open a camera don't need to worry
about ActiveCameraDeviceTracker.

To make people don't need to depend on CameraActivity/AppController, move
setting scope generation into two utility methods:
  * SettingsManager.getCameraSettingScope()
  * SettingsManager.getModuleSettingScope()

Bug: 19892712
Change-Id: I04caae24ea72a41d7d8e0786a99912098c2cf1ef

1 files changed, 11 insertions, 7 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 4445b2c45..53649453b 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -184,9 +184,6 @@ public class CameraActivity extends QuickActivity
     // panorama. If the extra is not set, it is in the normal camera mode.
     public static final String SECURE_CAMERA_EXTRA = "secure_camera";
 
-    public static final String MODULE_SCOPE_PREFIX = "_preferences_module_";
-    public static final String CAMERA_SCOPE_PREFIX = "_preferences_camera_";
-
     private static final int MSG_CLEAR_SCREEN_ON_FLAG = 2;
     private static final long SCREEN_DELAY_MS = 2 * 60 * 1000; // 2 mins.
     /** Load metadata for 10 items ahead of our current. */
@@ -214,6 +211,7 @@ public class CameraActivity extends QuickActivity
     private PhotoItemFactory mPhotoItemFactory;
     private LocalFilmstripDataAdapter mDataAdapter;
 
+    private ActiveCameraDeviceTracker mActiveCameraDeviceTracker;
     private OneCameraOpener mOneCameraOpener;
     private OneCameraManager mOneCameraManager;
     private SettingsManager mSettingsManager;
@@ -1028,7 +1026,7 @@ public class CameraActivity extends QuickActivity
     @Override
     public String getModuleScope() {
         ModuleAgent agent = mModuleManager.getModuleAgent(mCurrentModeIndex);
-        return MODULE_SCOPE_PREFIX + agent.getScopeNamespace();
+        return SettingsManager.getModuleSettingScope(agent.getScopeNamespace());
     }
 
     @Override
@@ -1038,7 +1036,8 @@ public class CameraActivity extends QuickActivity
         // this could cause user issues, so log a stack trace noting the call path
         // which resulted in this scenario.
 
-        return CAMERA_SCOPE_PREFIX + mCameraController.getCurrentCameraId().getValue();
+        return SettingsManager.getCameraSettingScope(
+                mCameraController.getCurrentCameraId().getValue());
     }
 
     @Override
@@ -1440,9 +1439,14 @@ public class CameraActivity extends QuickActivity
                       GlideFilmstripManager.MEDIASTORE_THUMB_HEIGHT));
         }
         profile.mark("Glide.setup");
+
+        mActiveCameraDeviceTracker = ActiveCameraDeviceTracker.instance();
         try {
             mOneCameraOpener = OneCameraModule.provideOneCameraOpener(
-                  mFeatureConfig, mAppContext, ResolutionUtil.getDisplayMetrics(this));
+                    mFeatureConfig,
+                    mAppContext,
+                    mActiveCameraDeviceTracker,
+                    ResolutionUtil.getDisplayMetrics(this));
             mOneCameraManager = OneCameraModule.provideOneCameraManager();
         } catch (OneCameraException e) {
             // Log error and continue start process while showing error dialog..
@@ -1456,7 +1460,7 @@ public class CameraActivity extends QuickActivity
                         CameraAgentFactory.CameraApi.API_1),
                 CameraAgentFactory.getAndroidCameraAgent(mAppContext,
                         CameraAgentFactory.CameraApi.AUTO),
-                ActiveCameraDeviceTracker.instance());
+                mActiveCameraDeviceTracker);
         mCameraController.setCameraExceptionHandler(
                 new CameraExceptionHandler(mCameraExceptionCallback, mMainHandler));