diff options
| author | Ray Chen <raychen@google.com> | 2012-03-23 22:10:21 +0800 |
|---|---|---|
| committer | Ray Chen <raychen@google.com> | 2012-03-29 10:42:51 +0800 |
| commit | 578f58212f6a29ba15c2e5795fbdd04fddb80019 (patch) | |
| tree | 7bb73ea5c85ce03d2b05421e0da0b91dc873bc6d | |
| parent | 68299015ac722e050794c5b3d8a3991871cac9f5 (diff) | |
| download | android_packages_apps_Snap-578f58212f6a29ba15c2e5795fbdd04fddb80019.tar.gz android_packages_apps_Snap-578f58212f6a29ba15c2e5795fbdd04fddb80019.tar.bz2 android_packages_apps_Snap-578f58212f6a29ba15c2e5795fbdd04fddb80019.zip | |
Move getTypeString from PicasaAlbumSet to MediaObject.
b/5344124
Change-Id: I28a43615ebec0aa84c3b16ac006def26f7b56162
| -rw-r--r-- | src/com/android/gallery3d/data/LocalAlbumSet.java | 5 | ||||
| -rw-r--r-- | src/com/android/gallery3d/data/MediaObject.java | 20 |
2 files changed, 21 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/data/LocalAlbumSet.java b/src/com/android/gallery3d/data/LocalAlbumSet.java index 0575e9b65..56c84f337 100644 --- a/src/com/android/gallery3d/data/LocalAlbumSet.java +++ b/src/com/android/gallery3d/data/LocalAlbumSet.java @@ -116,10 +116,7 @@ public class LocalAlbumSet extends MediaSet if (name.length < 2) { throw new IllegalArgumentException(path.toString()); } - if ("all".equals(name[1])) return MEDIA_TYPE_ALL; - if ("image".equals(name[1])) return MEDIA_TYPE_IMAGE; - if ("video".equals(name[1])) return MEDIA_TYPE_VIDEO; - throw new IllegalArgumentException(path.toString()); + return getTypeFromString(name[1]); } @Override diff --git a/src/com/android/gallery3d/data/MediaObject.java b/src/com/android/gallery3d/data/MediaObject.java index d0f1672fc..f78aa7a95 100644 --- a/src/com/android/gallery3d/data/MediaObject.java +++ b/src/com/android/gallery3d/data/MediaObject.java @@ -44,6 +44,10 @@ public abstract class MediaObject { public static final int MEDIA_TYPE_VIDEO = 4; public static final int MEDIA_TYPE_ALL = MEDIA_TYPE_IMAGE | MEDIA_TYPE_VIDEO; + public static final String MEDIA_TYPE_IMAGE_STRING = "image"; + public static final String MEDIA_TYPE_VIDEO_STRING = "video"; + public static final String MEDIA_TYPE_ALL_STRING = "all"; + // These are flags for cache() and return values for getCacheFlag(): public static final int CACHE_FLAG_NO = 0; public static final int CACHE_FLAG_SCREENNAIL = 1; @@ -127,4 +131,20 @@ public abstract class MediaObject { public static synchronized long nextVersionNumber() { return ++MediaObject.sVersionSerial; } + + public static int getTypeFromString(String s) { + if (MEDIA_TYPE_ALL_STRING.equals(s)) return MediaObject.MEDIA_TYPE_ALL; + if (MEDIA_TYPE_IMAGE_STRING.equals(s)) return MediaObject.MEDIA_TYPE_IMAGE; + if (MEDIA_TYPE_VIDEO_STRING.equals(s)) return MediaObject.MEDIA_TYPE_VIDEO; + throw new IllegalArgumentException(s); + } + + public static String getTypeString(int type) { + switch (type) { + case MEDIA_TYPE_IMAGE: return MEDIA_TYPE_IMAGE_STRING; + case MEDIA_TYPE_VIDEO: return MEDIA_TYPE_VIDEO_STRING; + case MEDIA_TYPE_ALL: return MEDIA_TYPE_ALL_STRING; + } + throw new IllegalArgumentException(); + } } |