diff options
| author | Wei Huang <weih@google.com> | 2011-10-18 06:59:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-18 06:59:30 -0700 |
| commit | 1508ab60efb9264484ab8811dee256944e4885d7 (patch) | |
| tree | 49a9fbff64e12054c0eaf06955d2442aab6903fe /src/com/android/camera/Camera.java | |
| parent | af327d0b5571a9bcddd3f8d69ec25dd4fc59e5b7 (diff) | |
| parent | d7a60abbee203872df4b5ab9a873e7efad80e239 (diff) | |
| download | LegacyCamera-1508ab60efb9264484ab8811dee256944e4885d7.zip LegacyCamera-1508ab60efb9264484ab8811dee256944e4885d7.tar.gz LegacyCamera-1508ab60efb9264484ab8811dee256944e4885d7.tar.bz2 | |
am d7a60abb: Merge "Disable Thumbnailview when Panorama capture is inProgress." into ics-mr0
* commit 'd7a60abbee203872df4b5ab9a873e7efad80e239':
Disable Thumbnailview when Panorama capture is inProgress.
Diffstat (limited to 'src/com/android/camera/Camera.java')
| -rw-r--r-- | src/com/android/camera/Camera.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 45e1867..54f709f 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1040,6 +1040,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, findViewById(R.id.btn_cancel).setVisibility(View.VISIBLE); } else { mThumbnailView = (RotateImageView) findViewById(R.id.thumbnail); + mThumbnailView.enableFilter(false); mThumbnailView.setVisibility(View.VISIBLE); } @@ -1180,6 +1181,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, } if (mModePicker != null) mModePicker.setEnabled(enable); if (mZoomControl != null) mZoomControl.setEnabled(enable); + if (mThumbnailView != null) mThumbnailView.setEnabled(enable); } public static int roundOrientation(int orientation) { |