diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-07 01:32:26 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-07 01:32:26 -0800 |
| commit | ac99f21a2a7efe9dfd4223cbb42eb3e33ba97479 (patch) | |
| tree | 955669be39bd951e6779c6ee41af11590a44ae6b /src/com/android/camera/PhotoUI.java | |
| parent | 66ec611d1439affebd031b4e2f0d6a718b19c976 (diff) | |
| parent | d7a1b78fdb2ffcdc13427de98bac6aa0787fbc8b (diff) | |
| download | android_packages_apps_Snap-ac99f21a2a7efe9dfd4223cbb42eb3e33ba97479.tar.gz android_packages_apps_Snap-ac99f21a2a7efe9dfd4223cbb42eb3e33ba97479.tar.bz2 android_packages_apps_Snap-ac99f21a2a7efe9dfd4223cbb42eb3e33ba97479.zip | |
Merge "SnapdragonCamera: fix app crash when switch to camcorder"
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 eb55b72be..48b84a873 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 |