diff options
author | Steve Kondik <steve@cyngn.com> | 2016-11-14 13:42:04 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-11-17 23:54:30 -0800 |
commit | 80b47c20e4f35545fce802b6acfd4496810e16dd (patch) | |
tree | d39d9424302ba3aa831ba4f4ee504619db50d8d5 /src/com/android/camera/CaptureModule.java | |
parent | 605a3aaabb1120673a254a78cfc027772c79ca3e (diff) | |
download | android_packages_apps_Snap-80b47c20e4f35545fce802b6acfd4496810e16dd.tar.gz android_packages_apps_Snap-80b47c20e4f35545fce802b6acfd4496810e16dd.tar.bz2 android_packages_apps_Snap-80b47c20e4f35545fce802b6acfd4496810e16dd.zip |
snap: Improve transitions
* Synchronize animation to filmstrip with input
* More code cleanups, introduce BaseModule
* Animations are hard
Change-Id: Ie664bb2059a28b3a9f3957fb491ec28fede521e5
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
-rw-r--r-- | src/com/android/camera/CaptureModule.java | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 8aea9cd35..9ccfc6e59 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -104,11 +104,12 @@ import java.util.List; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -public class CaptureModule implements CameraModule, PhotoController, +public class CaptureModule extends BaseModule<CaptureUI> implements PhotoController, MediaSaveService.Listener, ClearSightImageProcessor.Callback, SettingsManager.Listener, LocationManager.Listener, CountDownView.OnCountDownFinishedListener, PauseButton.OnPauseButtonListener { + public static final int DUAL_MODE = 0; public static final int BAYER_MODE = 1; public static final int MONO_MODE = 2; @@ -200,7 +201,6 @@ public class CaptureModule implements CameraModule, PhotoController, private boolean[] mCameraOpened = new boolean[MAX_NUM_CAM]; private CameraDevice[] mCameraDevice = new CameraDevice[MAX_NUM_CAM]; private String[] mCameraId = new String[MAX_NUM_CAM]; - private CaptureUI mUI; private CameraActivity mActivity; private List<Integer> mCameraIdList; private float mZoomValue = 1f; @@ -1694,11 +1694,6 @@ public class CaptureModule implements CameraModule, PhotoController, } @Override - public void onPreviewFocusChanged(boolean previewFocused) { - mUI.onPreviewFocusChanged(previewFocused); - } - - @Override public void onPauseBeforeSuper() { mPaused = true; mUI.onPause(); @@ -3516,19 +3511,4 @@ public class CaptureModule implements CameraModule, PhotoController, buffer.get(bytes); return bytes; } - - @Override - public void showPreviewCover() { - mUI.showPreviewCover(); - } - - @Override - public void hidePreviewCover() { - mUI.hidePreviewCover(); - } - - @Override - public void setPreviewCoverAlpha(float alpha) { - mUI.setPreviewCoverAlpha(alpha); - } } |