diff options
| author | George Mount <mount@google.com> | 2012-11-01 13:37:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-01 13:37:55 -0700 |
| commit | 25fab8057e0db4b1ff33b8da13b270d9af8ae217 (patch) | |
| tree | 06af291e00802e5fc3f62553de9b11ce34a6d587 /src/com/android | |
| parent | 40bb7158b8bda53433b36b94d6efed0e3937dcf2 (diff) | |
| parent | 78ea143fe02847b70d8669c79de5d54fd89fdd63 (diff) | |
| download | android_packages_apps_Gallery2-25fab8057e0db4b1ff33b8da13b270d9af8ae217.tar.gz android_packages_apps_Gallery2-25fab8057e0db4b1ff33b8da13b270d9af8ae217.tar.bz2 android_packages_apps_Gallery2-25fab8057e0db4b1ff33b8da13b270d9af8ae217.zip | |
Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/gallery3d/data/SecureAlbum.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/data/SecureAlbum.java b/src/com/android/gallery3d/data/SecureAlbum.java index 0a8c5a827..204f848f8 100644 --- a/src/com/android/gallery3d/data/SecureAlbum.java +++ b/src/com/android/gallery3d/data/SecureAlbum.java @@ -64,17 +64,22 @@ public class SecureAlbum extends MediaSet implements StitchingChangeListener { } public void addMediaItem(boolean isVideo, int id) { + Path pathBase; if (isVideo) { - mAllItems.add(Path.fromString("/local/video/item/" + id)); + pathBase = LocalVideo.ITEM_PATH; mMinVideoId = Math.min(mMinVideoId, id); mMaxVideoId = Math.max(mMaxVideoId, id); } else { - mAllItems.add(Path.fromString("/local/image/item/" + id)); + pathBase = LocalImage.ITEM_PATH; mMinImageId = Math.min(mMinImageId, id); mMaxImageId = Math.max(mMaxImageId, id); } - mAllItemTypes.add(isVideo); - mNotifier.fakeChange(); + Path path = pathBase.getChild(id); + if (!mAllItems.contains(path)) { + mAllItems.add(path); + mAllItemTypes.add(isVideo); + mNotifier.fakeChange(); + } } // The sequence is stitching items, local media items, and unlock image. |