diff options
author | Mangesh Ghiware <mghiware@google.com> | 2012-10-11 23:29:56 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-11 23:29:56 -0700 |
commit | a9e08bb7861ffa6e75c41cfe9156154d727b3ca4 (patch) | |
tree | fea6e39915eb39ddb0894b5cc735639983cbdbd7 | |
parent | dce3f1b83953b4a9fb1d863f8138b05fc72a1a7d (diff) | |
parent | c0d65a25b154985ea008decf48249d933e6996ac (diff) | |
download | android_packages_apps_Snap-a9e08bb7861ffa6e75c41cfe9156154d727b3ca4.tar.gz android_packages_apps_Snap-a9e08bb7861ffa6e75c41cfe9156154d727b3ca4.tar.bz2 android_packages_apps_Snap-a9e08bb7861ffa6e75c41cfe9156154d727b3ca4.zip |
am 423e45e4: Refresh panorama image after stitching completion
* commit '423e45e492d4ebdc41ecfeba73299de23b1463c4':
Refresh panorama image after stitching completion
-rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 11 | ||||
-rw-r--r-- | src/com/android/gallery3d/data/LocalImage.java | 2 | ||||
-rw-r--r-- | src/com/android/gallery3d/data/UriImage.java | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index db7f3d9f1..148ad051d 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -94,8 +94,9 @@ public class PhotoPage extends ActivityState implements private static final int MSG_ON_CAMERA_CENTER = 9; private static final int MSG_ON_PICTURE_CENTER = 10; private static final int MSG_REFRESH_IMAGE = 11; - private static final int MSG_UPDATE_DEFERRED = 12; + private static final int MSG_UPDATE_PHOTO_UI = 12; private static final int MSG_UPDATE_PROGRESS = 13; + private static final int MSG_UPDATE_DEFERRED = 14; private static final int HIDE_BARS_TIMEOUT = 3500; private static final int UNFREEZE_GLROOT_TIMEOUT = 250; @@ -194,7 +195,7 @@ public class PhotoPage extends ActivityState implements new SupportedOperationsListener() { @Override public void onChange(int operations) { - mHandler.sendEmptyMessage(MSG_REFRESH_IMAGE); + mHandler.sendEmptyMessage(MSG_UPDATE_PHOTO_UI); } }; @@ -366,6 +367,12 @@ public class PhotoPage extends ActivityState implements break; } case MSG_REFRESH_IMAGE: { + final MediaItem photo = mCurrentPhoto; + mCurrentPhoto = null; + updateCurrentPhoto(photo); + break; + } + case MSG_UPDATE_PHOTO_UI: { updateUIForCurrentPhoto(); break; } diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index dba6b68eb..60e5ab4e2 100644 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java @@ -288,8 +288,6 @@ public class LocalImage extends LocalMediaItem { @Override public void setSupportedOperationsListener(SupportedOperationsListener l) { synchronized (mLock) { - if (mPanoramaMetadataInitialized) return; // no more updates - if (l == null) { if (mGetPanoMetadataTask != null) { mGetPanoMetadataTask.cancel(); diff --git a/src/com/android/gallery3d/data/UriImage.java b/src/com/android/gallery3d/data/UriImage.java index 5fab667b8..51ad4b4f8 100644 --- a/src/com/android/gallery3d/data/UriImage.java +++ b/src/com/android/gallery3d/data/UriImage.java @@ -255,8 +255,6 @@ public class UriImage extends MediaItem { @Override public void setSupportedOperationsListener(SupportedOperationsListener l) { synchronized (mLock) { - if (mPanoramaMetadataInitialized) return; // no more updates - if (l != null) { if (mGetPanoMetadataTask != null) { mGetPanoMetadataTask.cancel(); |