diff options
| author | Wei Huang <weih@google.com> | 2011-10-18 06:58:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-18 06:58:26 -0700 |
| commit | d7a60abbee203872df4b5ab9a873e7efad80e239 (patch) | |
| tree | d27ea47a42168b00e8447c954bb4c2a853ddded9 /src/com/android/camera/Camera.java | |
| parent | ff55f519629fbe839fe051108b396565403d696e (diff) | |
| parent | 4a3026b84fa4fd403317b30b6a9db61125fecfa2 (diff) | |
| download | packages_apps_LegacyCamera-d7a60abbee203872df4b5ab9a873e7efad80e239.tar.gz packages_apps_LegacyCamera-d7a60abbee203872df4b5ab9a873e7efad80e239.tar.bz2 packages_apps_LegacyCamera-d7a60abbee203872df4b5ab9a873e7efad80e239.zip | |
Merge "Disable Thumbnailview when Panorama capture is inProgress." into ics-mr0
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 4eb3d4f8..685319f5 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) { |