Merge "Import translations. DO NOT MERGE" into jb-ub-mail
diff --git a/src/com/android/mail/photo/Intents.java b/src/com/android/mail/photo/Intents.java
index 4bd204f..e002bc0 100644
--- a/src/com/android/mail/photo/Intents.java
+++ b/src/com/android/mail/photo/Intents.java
@@ -73,8 +73,6 @@
public static class PhotoViewIntentBuilder {
private final Intent mIntent;
- /** The id of the photo being displayed */
- private long mPhotoId;
/** The name of the album being displayed */
private String mAlbumName;
/** The ID of the photo to force load */
@@ -96,11 +94,6 @@
mIntent = new Intent(context, cls);
}
- public PhotoViewIntentBuilder setPhotoId(long photoId) {
- mPhotoId = photoId;
- return this;
- }
-
/** Sets the album name */
public PhotoViewIntentBuilder setAlbumName(String albumName) {
mAlbumName = albumName;
diff --git a/src/com/android/mail/photo/PhotoViewActivity.java b/src/com/android/mail/photo/PhotoViewActivity.java
index 4e0fad8..233698d 100644
--- a/src/com/android/mail/photo/PhotoViewActivity.java
+++ b/src/com/android/mail/photo/PhotoViewActivity.java
@@ -236,11 +236,6 @@
mPhotosUri = mIntent.getStringExtra(Intents.EXTRA_PHOTOS_URI);
}
- // resolved uri of the photo to view; optional; supersedes mPhotosUri
- if (mIntent.hasExtra(Intents.EXTRA_RESOLVED_PHOTO_URI)) {
- mResolvedPhotoUri = mIntent.getStringExtra(Intents.EXTRA_RESOLVED_PHOTO_URI);
- }
-
// the loader page hint
if (mIntent.hasExtra(Intents.EXTRA_PAGE_HINT) && currentItem < 0) {
mPageHint = mIntent.getIntExtra(Intents.EXTRA_PAGE_HINT,
@@ -503,10 +498,7 @@
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
if (id == LOADER_PHOTO_LIST) {
mFragmentIsLoading = true;
- final Uri uri =
- TextUtils.isEmpty(mResolvedPhotoUri) ?
- Uri.parse(mPhotosUri) : Uri.parse(mResolvedPhotoUri);
- return new PhotoPagerLoader(this, uri, mPageHint);
+ return new PhotoPagerLoader(this, Uri.parse(mPhotosUri), mPageHint);
}
return null;
}
diff --git a/src/com/android/mail/photo/adapters/BaseCursorPagerAdapter.java b/src/com/android/mail/photo/adapters/BaseCursorPagerAdapter.java
index f71885c..9dc3535 100644
--- a/src/com/android/mail/photo/adapters/BaseCursorPagerAdapter.java
+++ b/src/com/android/mail/photo/adapters/BaseCursorPagerAdapter.java
@@ -25,7 +25,7 @@
import android.util.SparseIntArray;
import android.view.View;
-import com.android.mail.providers.UIProvider;
+import com.android.mail.photo.provider.PhotoContract.PhotoQuery;
import java.util.HashMap;
@@ -179,7 +179,7 @@
Cursor oldCursor = mCursor;
mCursor = newCursor;
if (newCursor != null) {
- mRowIDColumn = UIProvider.ATTACHMENT_URI_COLUMN;
+ mRowIDColumn = PhotoQuery.INDEX_URI;
mDataValid = true;
} else {
mRowIDColumn = -1;
@@ -233,7 +233,7 @@
mCursor = c;
mDataValid = cursorPresent;
mContext = context;
- mRowIDColumn = cursorPresent ? UIProvider.ATTACHMENT_URI_COLUMN : -1;
+ mRowIDColumn = cursorPresent ? PhotoQuery.INDEX_URI : -1;
}
/**
diff --git a/src/com/android/mail/photo/adapters/PhotoPagerAdapter.java b/src/com/android/mail/photo/adapters/PhotoPagerAdapter.java
index ab93bd6..05c13a0 100644
--- a/src/com/android/mail/photo/adapters/PhotoPagerAdapter.java
+++ b/src/com/android/mail/photo/adapters/PhotoPagerAdapter.java
@@ -23,12 +23,11 @@
import android.support.v4.app.FragmentManager;
import com.android.mail.photo.Intents;
-import com.android.mail.photo.Pageable;
import com.android.mail.photo.Intents.PhotoViewIntentBuilder;
+import com.android.mail.photo.Pageable;
import com.android.mail.photo.fragments.LoadingFragment;
import com.android.mail.photo.fragments.PhotoViewFragment;
import com.android.mail.photo.provider.PhotoContract.PhotoQuery;
-import com.android.mail.providers.UIProvider;
/**
* Pager adapter for the photo view
@@ -59,8 +58,7 @@
@Override
public Fragment getItem(Context context, Cursor cursor) {
-// final long photoId = cursor.getLong(PhotoQuery.INDEX_PHOTO_ID);
- final String photoUri = cursor.getString(UIProvider.ATTACHMENT_CONTENT_URI_COLUMN);
+ final String photoUri = cursor.getString(PhotoQuery.INDEX_CONTENT_URI);
// create new PhotoViewFragment
final PhotoViewIntentBuilder builder =
diff --git a/src/com/android/mail/photo/loaders/PhotoPagerLoader.java b/src/com/android/mail/photo/loaders/PhotoPagerLoader.java
index 226ac90..9906ab7 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.providers.UIProvider;
+import com.android.mail.photo.provider.PhotoContract.PhotoQuery;
/**
* Loader for a set of photo IDs.
@@ -38,7 +38,7 @@
final Uri loaderUri = getLoaderUri();
setUri(loaderUri);
- setProjection(UIProvider.ATTACHMENT_PROJECTION);
+ setProjection(PhotoQuery.PROJECTION);
returnCursor = super.esLoadInBackground();
return returnCursor;
diff --git a/src/com/android/mail/photo/provider/PhotoContract.java b/src/com/android/mail/photo/provider/PhotoContract.java
index 69184a2..19f834f 100644
--- a/src/com/android/mail/photo/provider/PhotoContract.java
+++ b/src/com/android/mail/photo/provider/PhotoContract.java
@@ -17,37 +17,39 @@
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 final String PHOTO_ID = "photo_id";
+ /**
+ * This column is a {@link Uri} that can be queried
+ * for this individual image (resulting cursor has one single row for this image).
+ */
public static final String URI = "uri";
- public static final String OWNER_ID = "owner_id";
- public static final String TITLE = "title";
- public static final String VIDEO_DATA = "video_data";
- public static final String ALBUM_NAME = "album_name";
+ /**
+ * This column is a {@link Uri} that points to the downloaded local file
+ * This value is undefined in any other state.
+ */
+ public static final String CONTENT_URI = "contentUri";
+ /**
+ * This string column is the MIME type.
+ */
+ public static final String CONTENT_TYPE = "contentType";
+
}
public static interface PhotoQuery {
/** Projection of the returned cursor */
public final static String[] PROJECTION = {
- PhotoViewColumns._ID,
PhotoViewColumns.URI,
- PhotoViewColumns.PHOTO_ID,
- PhotoViewColumns.OWNER_ID,
- PhotoViewColumns.TITLE,
- PhotoViewColumns.VIDEO_DATA,
- PhotoViewColumns.ALBUM_NAME,
+ PhotoViewColumns.CONTENT_URI,
+ PhotoViewColumns.CONTENT_TYPE,
};
- public final static int INDEX_ID = 0;
- public final static int INDEX_URI = 1;
- public final static int INDEX_PHOTO_ID = 2;
- public final static int INDEX_OWNER_ID = 3;
- public final static int INDEX_TITLE = 4;
- public final static int INDEX_VIDEO_DATA = 5;
- public final static int INDEX_ALBUM_NAME = 6;
+ public final static int INDEX_URI = 0;
+ public final static int INDEX_CONTENT_URI = 1;
+ public final static int INDEX_CONTENT_TYPE = 2;
}
}