diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2014-11-11 11:03:10 +0800 |
|---|---|---|
| committer | kaiyiz <kaiyiz@codeaurora.org> | 2014-12-16 11:44:56 +0800 |
| commit | d7a1b78fdb2ffcdc13427de98bac6aa0787fbc8b (patch) | |
| tree | 69772740b673d89813b9de0a43a035d0eade5e3c /src/com/android/camera/PhotoUI.java | |
| parent | b8a211285617dbecc49cf391db9219d82f38bdfd (diff) | |
| download | android_packages_apps_Snap-d7a1b78fdb2ffcdc13427de98bac6aa0787fbc8b.tar.gz android_packages_apps_Snap-d7a1b78fdb2ffcdc13427de98bac6aa0787fbc8b.tar.bz2 android_packages_apps_Snap-d7a1b78fdb2ffcdc13427de98bac6aa0787fbc8b.zip | |
SnapdragonCamera: fix app crash when switch to camcorder
Camera app crash when switch to camcorder during continuously shooting.
Prohibition click event when continuously shooting.
CRs-Fixed: 744811
Change-Id: Ia51ca53d46e060c2a4f4e877c37f795526532be7
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 48fb2f704..90234c620 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -280,6 +280,15 @@ public class PhotoUI implements PieListener, mSwitcher = (ModuleSwitcher) mRootView.findViewById(R.id.camera_switcher); mSwitcher.setCurrentIndex(ModuleSwitcher.PHOTO_MODULE_INDEX); mSwitcher.setSwitchListener(mActivity); + mSwitcher.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + if (mController.getCameraState() == PhotoController.LONGSHOT) { + return; + } + mSwitcher.showPopup(); + } + }); mMenuButton = mRootView.findViewById(R.id.menu); mCameraControls = (CameraControls) mRootView.findViewById(R.id.camera_controls); ViewStub faceViewStub = (ViewStub) mRootView |