diff options
| -rw-r--r-- | src/com/android/gallery3d/provider/GalleryProvider.java | 36 | ||||
| -rw-r--r-- | src_pd/com/android/gallery3d/picasasource/PicasaSource.java | 8 |
2 files changed, 32 insertions, 12 deletions
diff --git a/src/com/android/gallery3d/provider/GalleryProvider.java b/src/com/android/gallery3d/provider/GalleryProvider.java index 4068d460d..7cc4d5c09 100644 --- a/src/com/android/gallery3d/provider/GalleryProvider.java +++ b/src/com/android/gallery3d/provider/GalleryProvider.java @@ -16,17 +16,6 @@ package com.android.gallery3d.provider; -import com.android.gallery3d.app.GalleryApp; -import com.android.gallery3d.common.Utils; -import com.android.gallery3d.data.DataManager; -import com.android.gallery3d.data.DownloadCache; -import com.android.gallery3d.data.MediaItem; -import com.android.gallery3d.data.MediaObject; -import com.android.gallery3d.data.MtpImage; -import com.android.gallery3d.data.Path; -import com.android.gallery3d.picasasource.PicasaSource; -import com.android.gallery3d.util.GalleryUtils; - import android.content.ContentProvider; import android.content.ContentValues; import android.content.Context; @@ -39,6 +28,17 @@ import android.os.ParcelFileDescriptor; import android.provider.MediaStore.Images.ImageColumns; import android.util.Log; +import com.android.gallery3d.app.GalleryApp; +import com.android.gallery3d.common.Utils; +import com.android.gallery3d.data.DataManager; +import com.android.gallery3d.data.DownloadCache; +import com.android.gallery3d.data.MediaItem; +import com.android.gallery3d.data.MediaObject; +import com.android.gallery3d.data.MtpImage; +import com.android.gallery3d.data.Path; +import com.android.gallery3d.picasasource.PicasaSource; +import com.android.gallery3d.util.GalleryUtils; + import java.io.FileNotFoundException; import java.io.IOException; import java.io.OutputStream; @@ -48,7 +48,15 @@ public class GalleryProvider extends ContentProvider { public static final String AUTHORITY = "com.android.gallery3d.provider"; public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY); + + public static interface PicasaColumns { + public static final String USER_ACCOUNT = "user_account"; + public static final String PICASA_ID = "picasa_id"; + } + private static final String[] SUPPORTED_PICASA_COLUMNS = { + PicasaColumns.USER_ACCOUNT, + PicasaColumns.PICASA_ID, ImageColumns.DISPLAY_NAME, ImageColumns.SIZE, ImageColumns.MIME_TYPE, @@ -170,7 +178,11 @@ public class GalleryProvider extends ContentProvider { for (int i = 0, n = projection.length; i < n; ++i) { String column = projection[i]; - if (ImageColumns.DISPLAY_NAME.equals(column)) { + if (PicasaColumns.USER_ACCOUNT.equals(column)) { + columnValues[i] = PicasaSource.getUserAccount(getContext(), image); + } else if (PicasaColumns.PICASA_ID.equals(column)) { + columnValues[i] = PicasaSource.getPicasaId(image); + } else if (ImageColumns.DISPLAY_NAME.equals(column)) { columnValues[i] = PicasaSource.getImageTitle(image); } else if (ImageColumns.SIZE.equals(column)){ columnValues[i] = PicasaSource.getImageSize(image); diff --git a/src_pd/com/android/gallery3d/picasasource/PicasaSource.java b/src_pd/com/android/gallery3d/picasasource/PicasaSource.java index 8cfdac3a7..f8490676f 100644 --- a/src_pd/com/android/gallery3d/picasasource/PicasaSource.java +++ b/src_pd/com/android/gallery3d/picasasource/PicasaSource.java @@ -118,6 +118,14 @@ public class PicasaSource extends MediaSource { throw new UnsupportedOperationException(); } + public static long getPicasaId(MediaObject image) { + throw new UnsupportedOperationException(); + } + + public static String getUserAccount(Context context, MediaObject image) { + throw new UnsupportedOperationException(); + } + public static ParcelFileDescriptor openFile(Context context, MediaObject image, String mode) throws FileNotFoundException { throw new UnsupportedOperationException(); |