diff options
| author | Senpo Hu <senpo@google.com> | 2015-03-03 17:45:35 -0800 |
|---|---|---|
| committer | Senpo Hu <senpo@google.com> | 2015-03-04 12:29:17 -0800 |
| commit | a166b882d74c9c8d638479b79517c99448865e99 (patch) | |
| tree | 1de528440d0a88c3e6982bdc8fc5cb83b5a9d340 /src/com/android/camera/CameraActivity.java | |
| parent | 8d1f04d7babc04d73ac5bd0d9e1dd46bc559ff3d (diff) | |
| download | android_packages_apps_Camera2-a166b882d74c9c8d638479b79517c99448865e99.tar.gz android_packages_apps_Camera2-a166b882d74c9c8d638479b79517c99448865e99.tar.bz2 android_packages_apps_Camera2-a166b882d74c9c8d638479b79517c99448865e99.zip | |
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
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 00a3eb7b1..c6c2491e8 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1419,7 +1419,8 @@ public class CameraActivity extends QuickActivity mOrientationManager = new OrientationManagerImpl(this, mMainHandler); mSettingsManager = getServices().getSettingsManager(); mSoundPlayer = new SoundPlayer(mAppContext); - mFeatureConfig = OneCameraFeatureConfigCreator.createDefault(getContentResolver()); + mFeatureConfig = OneCameraFeatureConfigCreator.createDefault(getContentResolver(), + getServices().getMemoryManager()); profile.mark(); if (!Glide.isSetup()) { @@ -1448,8 +1449,8 @@ public class CameraActivity extends QuickActivity } profile.mark("Glide.setup"); try { - mCameraManager = OneCameraManager.get(this, ResolutionUtil.getDisplayMetrics(this), - mFeatureConfig); + mCameraManager = OneCameraManager.get( + mFeatureConfig, mAppContext, ResolutionUtil.getDisplayMetrics(this)); } catch (OneCameraException e) { // Log error and continue. Modules requiring OneCamera should check // and handle if null by showing error dialog or other treatment. |