diff options
author | Wu-cheng Li <wuchengli@google.com> | 2012-10-14 22:34:06 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-14 22:34:07 -0700 |
commit | bb9b933ce04eb50c85c0c592ebbc85d00dcbf47f (patch) | |
tree | 8ae6785c8b514ec1418779eda3c4d2623d24c44d /src | |
parent | 03cf9e04d820aff33a776a3b4b8744598f0cc365 (diff) | |
parent | ef1a61cb5470decd3ddf3729217ff1549eaeed43 (diff) | |
download | android_packages_apps_Snap-bb9b933ce04eb50c85c0c592ebbc85d00dcbf47f.tar.gz android_packages_apps_Snap-bb9b933ce04eb50c85c0c592ebbc85d00dcbf47f.tar.bz2 android_packages_apps_Snap-bb9b933ce04eb50c85c0c592ebbc85d00dcbf47f.zip |
Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 3 | ||||
-rw-r--r-- | src/com/android/gallery3d/data/SecureAlbum.java | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 5527c9e21..b11229f88 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -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); + } } } } diff --git a/src/com/android/gallery3d/data/SecureAlbum.java b/src/com/android/gallery3d/data/SecureAlbum.java index c666bdc75..0a8c5a827 100644 --- a/src/com/android/gallery3d/data/SecureAlbum.java +++ b/src/com/android/gallery3d/data/SecureAlbum.java @@ -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) { + } } |