diff options
| author | Michael Kolb <kolby@google.com> | 2013-03-11 22:35:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-11 22:35:01 +0000 |
| commit | d3ebbcf13190110baddf3d60bc65400d2ff73099 (patch) | |
| tree | 26cfd6d19ce5ffa1d38470055836a20722260fcf /src/com/android/camera/VideoModule.java | |
| parent | f0765f183c87fc5ab47f5a05193a06f8fc95757e (diff) | |
| parent | d6954f337e20365fc24ecffdd6f30e17c6b31eff (diff) | |
| download | android_packages_apps_Snap-d3ebbcf13190110baddf3d60bc65400d2ff73099.tar.gz android_packages_apps_Snap-d3ebbcf13190110baddf3d60bc65400d2ff73099.tar.bz2 android_packages_apps_Snap-d3ebbcf13190110baddf3d60bc65400d2ff73099.zip | |
Merge "Spring cleaning" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index a7a5335c6..1ecc4405d 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -91,7 +91,8 @@ public class VideoModule implements CameraModule, MediaRecorder.OnErrorListener, MediaRecorder.OnInfoListener, EffectsRecorder.EffectsListener, - PieRenderer.PieListener { + PieRenderer.PieListener, + PreviewGestures.SingleTapListener { private static final String TAG = "CAM_VideoModule"; @@ -213,7 +214,7 @@ public class VideoModule implements CameraModule, private RenderOverlay mRenderOverlay; private PieRenderer mPieRenderer; - private VideoController mVideoControl; + private VideoMenu mVideoControl; private AbstractSettingPopup mPopup; private int mPendingSwitchCameraId; @@ -393,7 +394,7 @@ public class VideoModule implements CameraModule, mRenderOverlay = (RenderOverlay) mRootView.findViewById(R.id.render_overlay); if (mPieRenderer == null) { mPieRenderer = new PieRenderer(mActivity); - mVideoControl = new VideoController(mActivity, this, mPieRenderer); + mVideoControl = new VideoMenu(mActivity, this, mPieRenderer); mVideoControl.setListener(this); mPieRenderer.setPieListener(this); } @@ -511,7 +512,6 @@ public class VideoModule implements CameraModule, settings.getPreferenceGroup(R.xml.video_preferences)); } - @Override public boolean collapseCameraControls() { boolean ret = false; if (mPopup != null) { |