diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2011-10-24 15:56:30 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2011-10-24 16:28:05 +0800 |
| commit | 7c216174c27b4b905a50b95709a12401e85c2c7d (patch) | |
| tree | 0baff0d8eabf99d566c1a6943cd7e8f2e4422a9b /src/com/android | |
| parent | 773d368357ce50bc299551a768584d5a222fd440 (diff) | |
| download | android_packages_apps_Snap-7c216174c27b4b905a50b95709a12401e85c2c7d.tar.gz android_packages_apps_Snap-7c216174c27b4b905a50b95709a12401e85c2c7d.tar.bz2 android_packages_apps_Snap-7c216174c27b4b905a50b95709a12401e85c2c7d.zip | |
Fix 5454748: Localize hardcoded folder names.
Change-Id: I91586d6f707a0352be6be524e848bd2c2dacab7e
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/gallery3d/data/LocalAlbum.java | 24 | ||||
| -rw-r--r-- | src/com/android/gallery3d/util/MediaSetUtils.java | 3 |
2 files changed, 24 insertions, 3 deletions
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/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), |