diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-04-02 08:55:02 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-04-02 08:55:02 -0700 |
commit | a46ee1e99fb9ff0274ca045c856e8fc828152761 (patch) | |
tree | 1400e6bea5c4d6acff5af651b0a7f1fe19d6a868 /src/com/android/camera/PhotoUI.java | |
parent | be8fdbe550983af2fdc231e5b314e9168622a294 (diff) | |
parent | 4ed08fc188a780bc73ba17116167de5c6689df22 (diff) | |
download | android_packages_apps_Snap-a46ee1e99fb9ff0274ca045c856e8fc828152761.tar.gz android_packages_apps_Snap-a46ee1e99fb9ff0274ca045c856e8fc828152761.tar.bz2 android_packages_apps_Snap-a46ee1e99fb9ff0274ca045c856e8fc828152761.zip |
Merge "SnapdragonCamera: Fix capture picture not to store"
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 65a822d74..8ccf5a49f 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -533,7 +533,8 @@ public class PhotoUI implements PieListener, mThumbnail.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - if (!CameraControls.isAnimating()) + if (!CameraControls.isAnimating() + && mController.getCameraState() != PhotoController.SNAPSHOT_IN_PROGRESS) mActivity.gotoGallery(); } }); |