From 9819424cbf0c21b50f4fefdd3472f543eec48d18 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Wed, 5 Oct 2011 17:24:16 +0800 Subject: Use merged album as the default parent set for an local media. Change-Id: I36062cc1ea06ec9d2eb05e74157f4a071484a8a7 fix: 5141166 --- src/com/android/gallery3d/data/LocalSource.java | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/com/android/gallery3d/data/LocalSource.java b/src/com/android/gallery3d/data/LocalSource.java index 58ac22490..9bb561b14 100644 --- a/src/com/android/gallery3d/data/LocalSource.java +++ b/src/com/android/gallery3d/data/LocalSource.java @@ -16,16 +16,16 @@ package com.android.gallery3d.data; -import com.android.gallery3d.app.Gallery; -import com.android.gallery3d.app.GalleryApp; -import com.android.gallery3d.data.MediaSet.ItemConsumer; - import android.content.ContentProviderClient; import android.content.ContentUris; import android.content.UriMatcher; import android.net.Uri; import android.provider.MediaStore; +import com.android.gallery3d.app.Gallery; +import com.android.gallery3d.app.GalleryApp; +import com.android.gallery3d.data.MediaSet.ItemConsumer; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -143,8 +143,7 @@ class LocalSource extends MediaSource { case MEDIA_TYPE_VIDEO: return Path.fromString("/local/video").getChild(id); default: - return Path.fromString("/merge/{/local/image,/local/video}") - .getChild(id); + return Path.fromString("/local/all").getChild(id); } } @@ -176,12 +175,9 @@ class LocalSource extends MediaSource { @Override public Path getDefaultSetOf(Path item) { MediaObject object = mApplication.getDataManager().getMediaObject(item); - if (object instanceof LocalImage) { - return Path.fromString("/local/image/").getChild( - String.valueOf(((LocalImage) object).getBucketId())); - } else if (object instanceof LocalVideo) { - return Path.fromString("/local/video/").getChild( - String.valueOf(((LocalVideo) object).getBucketId())); + if (object instanceof LocalMediaItem) { + return Path.fromString("/local/all").getChild( + String.valueOf(((LocalMediaItem) object).getBucketId())); } return null; } -- cgit v1.2.3