diff options
author | Sascha Haeberling <haeberling@google.com> | 2014-07-30 20:17:30 -0700 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2014-07-30 20:18:45 -0700 |
commit | f8df06c4a7d77b61e0f64448d15c50a2a61e263f (patch) | |
tree | 5cf94246541245552b3003b7f8eee30d34f532c5 /src | |
parent | ef66e81388982b89c710e75a9d9ae314b1de97f9 (diff) | |
download | android_packages_apps_Camera2-f8df06c4a7d77b61e0f64448d15c50a2a61e263f.tar.gz android_packages_apps_Camera2-f8df06c4a7d77b61e0f64448d15c50a2a61e263f.tar.bz2 android_packages_apps_Camera2-f8df06c4a7d77b61e0f64448d15c50a2a61e263f.zip |
[OC] Hook new Capture module up, behind a system property.
Bug: 16654225
Change-Id: I6be44fefce66c09425a1bebc1942489f6af7636c
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/module/ModulesInfo.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/com/android/camera/module/ModulesInfo.java b/src/com/android/camera/module/ModulesInfo.java index b77116862..1a36ac934 100644 --- a/src/com/android/camera/module/ModulesInfo.java +++ b/src/com/android/camera/module/ModulesInfo.java @@ -18,6 +18,7 @@ package com.android.camera.module; import android.content.Context; +import com.android.camera.CaptureModule; import com.android.camera.PhotoModule; import com.android.camera.VideoModule; import com.android.camera.app.AppController; @@ -26,6 +27,7 @@ import com.android.camera.debug.Log; import com.android.camera.util.GcamHelper; import com.android.camera.util.PhotoSphereHelper; import com.android.camera.util.RefocusHelper; +import com.android.camera.util.SystemProperties; import com.android.camera2.R; /** @@ -35,6 +37,12 @@ import com.android.camera2.R; public class ModulesInfo { private static final Log.Tag TAG = new Log.Tag("ModulesInfo"); + /** Switch between PhotoModule and the new CaptureModule. */ + private static final String PROP_ENABLE_CAPTURE_MODULE = "persist.camera.newcapture"; + private static final String VALUE_CAPTURE_MODULE_OFF = "0"; + private static final boolean ENABLE_CAPTURE_MODULE = !VALUE_CAPTURE_MODULE_OFF + .equals(SystemProperties.get(PROP_ENABLE_CAPTURE_MODULE, VALUE_CAPTURE_MODULE_OFF)); + public static void setupModules(Context context, ModuleManager moduleManager) { int photoModuleId = context.getResources().getInteger(R.integer.camera_mode_photo); registerPhotoModule(moduleManager, photoModuleId); @@ -66,12 +74,16 @@ public class ModulesInfo { @Override public boolean requestAppForCamera() { - return true; + // The PhotoModule requests the old app camere, while the new + // capture module is using OneCamera. At some point we'll + // refactor all modules to use OneCamera, then the new module + // doesn't have to manage it itself. + return !ENABLE_CAPTURE_MODULE; } @Override public ModuleController createModule(AppController app) { - return new PhotoModule(app); + return ENABLE_CAPTURE_MODULE ? new CaptureModule(app) : new PhotoModule(app); } }); } |