diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 10 | ||||
| -rw-r--r-- | src/com/android/gallery3d/data/LocalAlbum.java | 24 | ||||
| -rw-r--r-- | src/com/android/gallery3d/ui/ScrollerHelper.java | 3 | ||||
| -rw-r--r-- | src/com/android/gallery3d/util/MediaSetUtils.java | 3 |
4 files changed, 30 insertions, 10 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index b7e00971d..8b2ce5255 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -597,14 +597,12 @@ public class AlbumSetPage extends ActivityState implements if (mSyncTask.isDone()){ // The mediaSet is in sync. Turn off the loading indicator. GalleryUtils.setSpinnerVisibility((Activity) mActivity, false); - - // Only show toast when there's no album and we are going to finish - // the page. Toast is redundant if we are going to stay on this page. - if ((mAlbumSetDataAdapter.size() == 0) - && (mActivity.getStateManager().getStateCount() > 1)) { + if (mAlbumSetDataAdapter.size() == 0) { Toast.makeText((Context) mActivity, R.string.empty_album, Toast.LENGTH_LONG).show(); - mActivity.getStateManager().finishState(AlbumSetPage.this); + if (mActivity.getStateManager().getStateCount() > 1) { + mActivity.getStateManager().finishState(AlbumSetPage.this); + } } } } diff --git a/src/com/android/gallery3d/data/LocalAlbum.java b/src/com/android/gallery3d/data/LocalAlbum.java index 5bd4398b4..28364cb71 100644 --- a/src/com/android/gallery3d/data/LocalAlbum.java +++ b/src/com/android/gallery3d/data/LocalAlbum.java @@ -16,11 +16,14 @@ package com.android.gallery3d.data; +import com.android.gallery3d.R; import com.android.gallery3d.app.GalleryApp; import com.android.gallery3d.common.Utils; import com.android.gallery3d.util.GalleryUtils; +import com.android.gallery3d.util.MediaSetUtils; import android.content.ContentResolver; +import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; import android.provider.MediaStore.Images; @@ -45,7 +48,7 @@ public class LocalAlbum extends MediaSet { private final GalleryApp mApplication; private final ContentResolver mResolver; private final int mBucketId; - private final String mBucketName; + private final String mName; private final boolean mIsImage; private final ChangeNotifier mNotifier; private final Path mItemPath; @@ -57,7 +60,7 @@ public class LocalAlbum extends MediaSet { mApplication = application; mResolver = application.getContentResolver(); mBucketId = bucketId; - mBucketName = name; + mName = getLocalizedName(application.getResources(), bucketId, name); mIsImage = isImage; if (isImage) { @@ -221,7 +224,7 @@ public class LocalAlbum extends MediaSet { @Override public String getName() { - return mBucketName; + return mName; } @Override @@ -249,4 +252,19 @@ public class LocalAlbum extends MediaSet { public boolean isLeafAlbum() { return true; } + + private static String getLocalizedName(Resources res, int bucketId, + String name) { + if (bucketId == MediaSetUtils.CAMERA_BUCKET_ID) { + return res.getString(R.string.folder_camera); + } else if (bucketId == MediaSetUtils.DOWNLOAD_BUCKET_ID) { + return res.getString(R.string.folder_download); + } else if (bucketId == MediaSetUtils.IMPORTED_BUCKET_ID) { + return res.getString(R.string.folder_imported); + } else if (bucketId == MediaSetUtils.SNAPSHOT_BUCKET_ID) { + return res.getString(R.string.folder_screenshot); + } else { + return name; + } + } } diff --git a/src/com/android/gallery3d/ui/ScrollerHelper.java b/src/com/android/gallery3d/ui/ScrollerHelper.java index 84235185b..0fa85ee41 100644 --- a/src/com/android/gallery3d/ui/ScrollerHelper.java +++ b/src/com/android/gallery3d/ui/ScrollerHelper.java @@ -84,7 +84,8 @@ public class ScrollerHelper { // Returns the distance that over the scroll limit. public int startScroll(int distance, int min, int max) { int currPosition = mScroller.getCurrX(); - int finalPosition = mScroller.getFinalX(); + int finalPosition = mScroller.isFinished() ? currPosition : + mScroller.getFinalX(); int newPosition = Utils.clamp(finalPosition + distance, min, max); if (newPosition != currPosition) { mScroller.startScroll( diff --git a/src/com/android/gallery3d/util/MediaSetUtils.java b/src/com/android/gallery3d/util/MediaSetUtils.java index 817ffedcb..8a556aa79 100644 --- a/src/com/android/gallery3d/util/MediaSetUtils.java +++ b/src/com/android/gallery3d/util/MediaSetUtils.java @@ -34,6 +34,9 @@ public class MediaSetUtils { public static final int IMPORTED_BUCKET_ID = GalleryUtils.getBucketId( Environment.getExternalStorageDirectory().toString() + "/" + MtpContext.NAME_IMPORTED_FOLDER); + public static final int SNAPSHOT_BUCKET_ID = GalleryUtils.getBucketId( + Environment.getExternalStorageDirectory().toString() + + "/Pictures/Screenshots"); private static final Path[] CAMERA_PATHS = { Path.fromString("/local/all/" + CAMERA_BUCKET_ID), |