diff options
author | George Mount <mount@google.com> | 2012-11-01 13:40:01 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-01 13:40:01 -0700 |
commit | 644101695e23bf682de4ac9e62569ea79cfef0bc (patch) | |
tree | b918020df7ceab0d3cc02911fded7940abf9f3a5 | |
parent | 22151ee069f8f4a64cd51ddbe36aac294d19e234 (diff) | |
parent | 25fab8057e0db4b1ff33b8da13b270d9af8ae217 (diff) | |
download | android_packages_apps_Gallery2-644101695e23bf682de4ac9e62569ea79cfef0bc.tar.gz android_packages_apps_Gallery2-644101695e23bf682de4ac9e62569ea79cfef0bc.tar.bz2 android_packages_apps_Gallery2-644101695e23bf682de4ac9e62569ea79cfef0bc.zip |
am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
* commit '25fab8057e0db4b1ff33b8da13b270d9af8ae217':
Fix extra gray item in secure album.
-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. |