diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-12 14:08:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-12 14:08:03 -0700 |
| commit | 2061ddca51d6cc4816073c857836c9283f7853b5 (patch) | |
| tree | 690ef948e4cd36552bf125a7571bf177691e3754 | |
| parent | 99abd47222e829493b0757fe332bb83926c5d85d (diff) | |
| parent | 834a5e0da57fc92aeb79fd9c3b8fc44662415c9e (diff) | |
| download | android_packages_apps_Snap-2061ddca51d6cc4816073c857836c9283f7853b5.tar.gz android_packages_apps_Snap-2061ddca51d6cc4816073c857836c9283f7853b5.tar.bz2 android_packages_apps_Snap-2061ddca51d6cc4816073c857836c9283f7853b5.zip | |
Merge "Improve performance of filmstrip" into gb-ub-photos-arches
| -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/MediaObject.java | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/data/UriImage.java | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 148ad051d..5527c9e21 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -194,8 +194,15 @@ public class PhotoPage extends ActivityState implements private SupportedOperationsListener mSupportedOperationsListener = new SupportedOperationsListener() { @Override - public void onChange(int operations) { - mHandler.sendEmptyMessage(MSG_UPDATE_PHOTO_UI); + public void onChange(MediaObject item, int operations) { + if (item == mCurrentPhoto) { + if (mPhotoView.getFilmMode() + && SystemClock.uptimeMillis() < mDeferUpdateUntil) { + requestDeferredUpdate(); + } else { + mHandler.sendEmptyMessage(MSG_UPDATE_PHOTO_UI); + } + } } }; diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index 60e5ab4e2..2ba784de7 100644 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java @@ -306,7 +306,7 @@ public class LocalImage extends LocalMediaItem { mPanoramaMetadata = future.get(); mPanoramaMetadataInitialized = true; if (mListener != null) { - mListener.onChange(getSupportedOperations()); + mListener.onChange(LocalImage.this, getSupportedOperations()); } } }); diff --git a/src/com/android/gallery3d/data/MediaObject.java b/src/com/android/gallery3d/data/MediaObject.java index 382a5c792..1fdf8a216 100644 --- a/src/com/android/gallery3d/data/MediaObject.java +++ b/src/com/android/gallery3d/data/MediaObject.java @@ -50,7 +50,7 @@ public abstract class MediaObject { public static final int SUPPORT_ALL = 0xffffffff; public static interface SupportedOperationsListener { - public void onChange(int operations); + public void onChange(MediaObject item, int operations); } // These are the bits returned from getMediaType(): diff --git a/src/com/android/gallery3d/data/UriImage.java b/src/com/android/gallery3d/data/UriImage.java index 51ad4b4f8..aaa36a917 100644 --- a/src/com/android/gallery3d/data/UriImage.java +++ b/src/com/android/gallery3d/data/UriImage.java @@ -273,7 +273,7 @@ public class UriImage extends MediaItem { mPanoramaMetadata = future.get(); mPanoramaMetadataInitialized = true; if (mListener != null) { - mListener.onChange(getSupportedOperations()); + mListener.onChange(UriImage.this, getSupportedOperations()); } } }); |