am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches (504d7c83) · Commits · e / os / android_packages_apps_Gallery2

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -562,6 +562,9 @@ public class PhotoPage extends ActivityState implements
		mProgressBar = new PhotoPageProgressBar(mActivity, galleryRoot);
		mProgressListener = new UpdateProgressListener();
		progressManager.addChangeListener(mProgressListener);
		if (mSecureAlbum != null) {
		progressManager.addChangeListener(mSecureAlbum);
		}
		}
		}
		}

+16 −1

Original line number	Diff line number	Diff line
		@@ -24,12 +24,13 @@ import android.provider.MediaStore.MediaColumns;
		import android.provider.MediaStore.Video;

		import com.android.gallery3d.app.GalleryApp;
		import com.android.gallery3d.app.StitchingChangeListener;
		import com.android.gallery3d.util.MediaSetUtils;

		import java.util.ArrayList;

		// This class lists all media items added by the client.
		public class SecureAlbum extends MediaSet {
		public class SecureAlbum extends MediaSet implements StitchingChangeListener {
		@SuppressWarnings("unused")
		private static final String TAG = "SecureAlbum";
		private static final String[] PROJECTION = {MediaColumns._ID};
		@@ -183,4 +184,18 @@ public class SecureAlbum extends MediaSet {
		public boolean isLeafAlbum() {
		return true;
		}

		@Override
		public void onStitchingQueued(Uri uri) {
		int id = Integer.parseInt(uri.getLastPathSegment());
		addMediaItem(false, id);
		}

		@Override
		public void onStitchingResult(Uri uri) {
		}

		@Override
		public void onStitchingProgress(Uri uri, final int progress) {
		}
		}