commit 1155364fb90f5c4b65821c05f2be00ea8b56a1ee
author Andrew Sapperstein <asapperstein@google.com> Tue May 29 15:45:41 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 29 15:45:41 2012 -0700
tree 203d18df668b0a3afa7aabcc8c6fc7ac7f05f1fc
parent 48b2a6c5fe209f0603fdf85d35cf399f7f7d462e
parent 8c199f4cd7a072e1af644f430c6233547b720add

Merge "Added filtering to the photo viewer." into jb-ub-mail

src/com/android/mail/photo/loaders/PhotoPagerLoader.java

diff --git a/src/com/android/mail/photo/loaders/PhotoPagerLoader.java b/src/com/android/mail/photo/loaders/PhotoPagerLoader.java
index 9906ab7..c965e0d 100644
--- a/src/com/android/mail/photo/loaders/PhotoPagerLoader.java
+++ b/src/com/android/mail/photo/loaders/PhotoPagerLoader.java
@@ -21,7 +21,7 @@
 import android.database.Cursor;
 import android.net.Uri;
 
-import com.android.mail.photo.provider.PhotoContract.PhotoQuery;
+import com.android.mail.photo.provider.PhotoContract;
 
 /**
  * Loader for a set of photo IDs.
@@ -36,9 +36,10 @@
     public Cursor esLoadInBackground() {
         Cursor returnCursor = null;
 
-        final Uri loaderUri = getLoaderUri();
+        final Uri loaderUri = getLoaderUri().buildUpon().appendQueryParameter(
+                PhotoContract.ContentTypeParameters.CONTENT_TYPE, "image/").build();
         setUri(loaderUri);
-        setProjection(PhotoQuery.PROJECTION);
+        setProjection(PhotoContract.PhotoQuery.PROJECTION);
         returnCursor = super.esLoadInBackground();
 
         return returnCursor;

src/com/android/mail/photo/provider/PhotoContract.java

diff --git a/src/com/android/mail/photo/provider/PhotoContract.java b/src/com/android/mail/photo/provider/PhotoContract.java
index 19f834f..0953589 100644
--- a/src/com/android/mail/photo/provider/PhotoContract.java
+++ b/src/com/android/mail/photo/provider/PhotoContract.java
@@ -18,11 +18,10 @@
 package com.android.mail.photo.provider;
 
 import android.net.Uri;
-import android.provider.BaseColumns;
 
 public final class PhotoContract {
     /** Columns for the view {@link #PHOTO_VIEW} */
-    public static interface PhotoViewColumns extends BaseColumns {
+    public static interface PhotoViewColumns {
         /**
          * This column is a {@link Uri} that can be queried
          * for this individual image (resulting cursor has one single row for this image).
@@ -52,4 +51,14 @@
         public final static int INDEX_CONTENT_URI = 1;
         public final static int INDEX_CONTENT_TYPE = 2;
     }
+
+    public static final class ContentTypeParameters {
+        /**
+         * Parameter used to specify which type of content to return.
+         * Allows multiple types to be specified.
+         */
+        public static final String CONTENT_TYPE = "contentType";
+
+        private ContentTypeParameters() {}
+    }
 }