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 | 310150da6405d21ebb6db64c2a3d9f7df925f17d (patch) | |
tree | 52bca39a15a4fd186da5d60106ef63ad51eec88d | |
parent | ae448c720c14ded7a86e825ad5f8a3bb4194f2a6 (diff) | |
parent | 2e13c999e8f63296e643e9a921950f3b964b3eff (diff) | |
download | android_packages_apps_Snap-310150da6405d21ebb6db64c2a3d9f7df925f17d.tar.gz android_packages_apps_Snap-310150da6405d21ebb6db64c2a3d9f7df925f17d.tar.bz2 android_packages_apps_Snap-310150da6405d21ebb6db64c2a3d9f7df925f17d.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. |