Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d2e9903 authored Oct 12, 2012 by Bobby Georgescu Committed by Android (Google) Code Review Oct 12, 2012

Merge "Improve performance of filmstrip" into gb-ub-photos-arches

parents 7776408c 5273e830

src/com/android/gallery3d/app/PhotoPage.java

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -194,9 +194,16 @@ public class PhotoPage extends ActivityState implements
	private SupportedOperationsListener mSupportedOperationsListener =		private SupportedOperationsListener mSupportedOperationsListener =
	new SupportedOperationsListener() {		new SupportedOperationsListener() {
	@Override		@Override
	public void onChange(int operations) {		public void onChange(MediaObject item, int operations) {
			if (item == mCurrentPhoto) {
			if (mPhotoView.getFilmMode()
			&& SystemClock.uptimeMillis() < mDeferUpdateUntil) {
			requestDeferredUpdate();
			} else {
	mHandler.sendEmptyMessage(MSG_UPDATE_PHOTO_UI);		mHandler.sendEmptyMessage(MSG_UPDATE_PHOTO_UI);
	}		}
			}
			}
	};		};

	public static interface Model extends PhotoView.Model {		public static interface Model extends PhotoView.Model {

src/com/android/gallery3d/data/LocalImage.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -306,7 +306,7 @@ public class LocalImage extends LocalMediaItem {
	mPanoramaMetadata = future.get();		mPanoramaMetadata = future.get();
	mPanoramaMetadataInitialized = true;		mPanoramaMetadataInitialized = true;
	if (mListener != null) {		if (mListener != null) {
	mListener.onChange(getSupportedOperations());		mListener.onChange(LocalImage.this, getSupportedOperations());
	}		}
	}		}
	});		});

src/com/android/gallery3d/data/MediaObject.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,7 @@ public abstract class MediaObject {
	public static final int SUPPORT_ALL = 0xffffffff;		public static final int SUPPORT_ALL = 0xffffffff;

	public static interface SupportedOperationsListener {		public static interface SupportedOperationsListener {
	public void onChange(int operations);		public void onChange(MediaObject item, int operations);
	}		}

	// These are the bits returned from getMediaType():		// These are the bits returned from getMediaType():

src/com/android/gallery3d/data/UriImage.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -273,7 +273,7 @@ public class UriImage extends MediaItem {
	mPanoramaMetadata = future.get();		mPanoramaMetadata = future.get();
	mPanoramaMetadataInitialized = true;		mPanoramaMetadataInitialized = true;
	if (mListener != null) {		if (mListener != null) {
	mListener.onChange(getSupportedOperations());		mListener.onChange(UriImage.this, getSupportedOperations());
	}		}
	}		}
	});		});