summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-11-01 10:40:22 -0700
committerGeorge Mount <mount@google.com>2012-11-01 11:51:20 -0700
commit91ee484aa3092135bf05b4d62e4fc025321ae62b (patch)
tree0eb19c5c574675abaf26e97760d94dbea6546940
parenta3c8cf04c31af4d53bb81d161241c13656847166 (diff)
downloadandroid_packages_apps_Snap-91ee484aa3092135bf05b4d62e4fc025321ae62b.tar.gz
android_packages_apps_Snap-91ee484aa3092135bf05b4d62e4fc025321ae62b.tar.bz2
android_packages_apps_Snap-91ee484aa3092135bf05b4d62e4fc025321ae62b.zip
Fix extra gray item in secure album.
Bug 7454444 Change-Id: I83f40e7e74f658a7b9ada148932a231ef8c31f73
-rw-r--r--src/com/android/gallery3d/data/SecureAlbum.java13
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.