diff options
| author | Angus Kong <shkong@google.com> | 2012-09-19 20:39:45 +0800 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2012-10-04 11:45:08 -0700 |
| commit | 356ffa04adff94a09fe60849b40397aa8ee018b8 (patch) | |
| tree | f8ce63bd37e0ce7e5c80f3670428d7c6671d8b9b /src/com/android/gallery3d/data/LocalAlbumSet.java | |
| parent | 25ab25343c04ed845717b7d25d67be66c247e48d (diff) | |
| download | android_packages_apps_Snap-356ffa04adff94a09fe60849b40397aa8ee018b8.tar.gz android_packages_apps_Snap-356ffa04adff94a09fe60849b40397aa8ee018b8.tar.bz2 android_packages_apps_Snap-356ffa04adff94a09fe60849b40397aa8ee018b8.zip | |
Support panorama progress items in Gallery.
Bug 7259843
Add dummy files for showing panorama progress in filmstrip.
Change-Id: I7ae92b90bbbd992fde00cfcfc68af69b34d34d74
Diffstat (limited to 'src/com/android/gallery3d/data/LocalAlbumSet.java')
| -rw-r--r-- | src/com/android/gallery3d/data/LocalAlbumSet.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/data/LocalAlbumSet.java b/src/com/android/gallery3d/data/LocalAlbumSet.java index d737ca803..afaac4965 100644 --- a/src/com/android/gallery3d/data/LocalAlbumSet.java +++ b/src/com/android/gallery3d/data/LocalAlbumSet.java @@ -26,6 +26,7 @@ import com.android.gallery3d.app.GalleryApp; import com.android.gallery3d.data.BucketHelper.BucketEntry; import com.android.gallery3d.util.Future; import com.android.gallery3d.util.FutureListener; +import com.android.gallery3d.util.LightCycleHelper; import com.android.gallery3d.util.MediaSetUtils; import com.android.gallery3d.util.ThreadPool; import com.android.gallery3d.util.ThreadPool.JobContext; @@ -92,7 +93,7 @@ public class LocalAlbumSet extends MediaSet } private static int findBucket(BucketEntry entries[], int bucketId) { - for (int i = 0, n = entries.length; i < n ; ++i) { + for (int i = 0, n = entries.length; i < n; ++i) { if (entries[i].bucketId == bucketId) return i; } return -1; @@ -127,6 +128,11 @@ public class LocalAlbumSet extends MediaSet for (BucketEntry entry : entries) { MediaSet album = getLocalAlbum(dataManager, mType, mPath, entry.bucketId, entry.bucketName); + if (LightCycleHelper.hasLightCycleCapture(mApplication.getAndroidContext()) + && album.isCameraRoll()) { + album = dataManager.getMediaSet(Path.fromString( + LightCycleHelper.wrapGalleryPath(album.getPath().toString()))); + } albums.add(album); } return albums; |