diff options
4 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java index 0a2475acb..8fe0f0087 100644 --- a/src/com/android/gallery3d/app/MovieActivity.java +++ b/src/com/android/gallery3d/app/MovieActivity.java @@ -179,7 +179,7 @@ public class MovieActivity extends Activity { return true; } - @TargetApi(ApiHelper.VERSION_CODES.JELLY_BEAN) + @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) private void initializeShareActionProvider(Menu menu) { if (!ApiHelper.HAS_SHARE_ACTION_PROVIDER) return; diff --git a/src/com/android/gallery3d/app/PhotoDataAdapter.java b/src/com/android/gallery3d/app/PhotoDataAdapter.java index ae01dd9ec..7b979a7d5 100644 --- a/src/com/android/gallery3d/app/PhotoDataAdapter.java +++ b/src/com/android/gallery3d/app/PhotoDataAdapter.java @@ -1036,8 +1036,9 @@ public class PhotoDataAdapter implements PhotoPage.Model { // Don't change index if mSize == 0 if (mSize > 0) { if (index >= mSize) index = mSize - 1; - info.indexHint = index; } + + info.indexHint = index; } executeAndWait(new UpdateContent(info)); diff --git a/src/com/android/gallery3d/data/BucketHelper.java b/src/com/android/gallery3d/data/BucketHelper.java index 71c0ad4ed..3418dafb7 100644 --- a/src/com/android/gallery3d/data/BucketHelper.java +++ b/src/com/android/gallery3d/data/BucketHelper.java @@ -75,7 +75,7 @@ class BucketHelper { // already know the media type from the table we query from. private static final String[] PROJECTION_BUCKET_IN_ONE_TABLE = { ImageColumns.BUCKET_ID, - "MAX(date_taken)", + "MAX(datetaken)", ImageColumns.BUCKET_DISPLAY_NAME}; // We keep the INDEX_BUCKET_ID and INDEX_BUCKET_NAME the same as diff --git a/src/com/android/gallery3d/data/MediaObject.java b/src/com/android/gallery3d/data/MediaObject.java index f78aa7a95..0ed5b7a9a 100644 --- a/src/com/android/gallery3d/data/MediaObject.java +++ b/src/com/android/gallery3d/data/MediaObject.java @@ -88,7 +88,8 @@ public abstract class MediaObject { } public Uri getContentUri() { - throw new UnsupportedOperationException(); + String className = getClass().getName(); + throw new UnsupportedOperationException(className); } public Uri getPlayUri() { |