From d134e18e3c2d9614099d3b74e1a6a12159a1e81a Mon Sep 17 00:00:00 2001 From: Ray Chen Date: Fri, 23 Mar 2012 22:10:21 +0800 Subject: Move getTypeString from PicasaAlbumSet to MediaObject. b/5344124 Change-Id: I28a43615ebec0aa84c3b16ac006def26f7b56162 --- src/com/android/gallery3d/data/LocalAlbumSet.java | 5 +---- src/com/android/gallery3d/data/MediaObject.java | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) (limited to 'src') 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(); + } } -- cgit v1.2.3