summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoModule.java
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-08-08 18:08:43 -0700
committerDoris Liu <tianliu@google.com>2013-08-09 15:01:39 -0700
commitc3679c0961521165499380c77344acc69072b2ac (patch)
treef7aa003114196882afb3941fe98e9c0a0bc53680 /src/com/android/camera/VideoModule.java
parent3d0b691b8f7a844093e8de9267ffa2ce16d0c5a9 (diff)
downloadandroid_packages_apps_Snap-c3679c0961521165499380c77344acc69072b2ac.tar.gz
android_packages_apps_Snap-c3679c0961521165499380c77344acc69072b2ac.tar.bz2
android_packages_apps_Snap-c3679c0961521165499380c77344acc69072b2ac.zip
Use PopupWindow for settings popup
Bug:10261902 Change-Id: Ia77cff276615db8c3fbb9e859bf099249b4021cf
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
-rw-r--r--src/com/android/camera/VideoModule.java10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 1516cb5d0..80bbbca37 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -423,12 +423,6 @@ public class VideoModule implements CameraModule,
return;
}
- if (!mMediaRecorderRecording) {
- // check for dismissing popup
- mUI.dismissPopup(true);
- return;
- }
-
// Set rotation and gps data.
int rotation = Util.getJpegRotation(mCameraId, mOrientation);
mParameters.setRotation(rotation);
@@ -945,8 +939,8 @@ public class VideoModule implements CameraModule,
mPendingSwitchCameraId = -1;
mSwitchingCamera = false;
mPreferenceRead = false;
- // Call onPause after stopping video recording. So the camera can be
- // released as soon as possible.
+
+ mUI.collapseCameraControls();
}
@Override