summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2012-10-11 23:11:27 -0700
committerMangesh Ghiware <mghiware@google.com>2012-10-11 23:17:43 -0700
commitc0d65a25b154985ea008decf48249d933e6996ac (patch)
treef30a1ac82e7241d694adfd9a4d8228ec0929d130
parent9c53ef91923931f0d8d079760777e6f4507ae48f (diff)
downloadandroid_packages_apps_Snap-c0d65a25b154985ea008decf48249d933e6996ac.tar.gz
android_packages_apps_Snap-c0d65a25b154985ea008decf48249d933e6996ac.tar.bz2
android_packages_apps_Snap-c0d65a25b154985ea008decf48249d933e6996ac.zip
Refresh panorama image after stitching completion
Bug: 7336784 Updating photo refreshes the supported operations which indiate if said MediaItem is a panorama or not. Change-Id: If3a169c9256b3f898594a30740930b5dfd96dba0
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java11
-rw-r--r--src/com/android/gallery3d/data/LocalImage.java2
-rw-r--r--src/com/android/gallery3d/data/UriImage.java2
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();