summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/data/LocalMediaData.java
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-08-12 15:03:45 -0700
committerAngus Kong <shkong@google.com>2013-08-12 16:02:13 -0700
commitc27d21bc3b9322936004827ab005fb7d1facfacf (patch)
tree9fb03089c5a4fbf43ea90d605a6fec1b1b5babed /src/com/android/camera/data/LocalMediaData.java
parentd806e6528092fd309bb2128ad5a539c72f52fd42 (diff)
downloadandroid_packages_apps_Snap-c27d21bc3b9322936004827ab005fb7d1facfacf.tar.gz
android_packages_apps_Snap-c27d21bc3b9322936004827ab005fb7d1facfacf.tar.bz2
android_packages_apps_Snap-c27d21bc3b9322936004827ab005fb7d1facfacf.zip
Add local data types.
We need local data types to generate different menus. bug:10245009 Change-Id: I95f947c11ad3f39172c43f75f4108bf720148278
Diffstat (limited to 'src/com/android/camera/data/LocalMediaData.java')
-rw-r--r--src/com/android/camera/data/LocalMediaData.java32
1 files changed, 24 insertions, 8 deletions
diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java
index cd568239d..05b907a1e 100644
--- a/src/com/android/camera/data/LocalMediaData.java
+++ b/src/com/android/camera/data/LocalMediaData.java
@@ -61,12 +61,15 @@ public abstract class LocalMediaData implements LocalData {
protected int height;
/** The panorama metadata information of this media data. */
- private PhotoSphereHelper.PanoramaMetadata mPanoramaMetadata;
+ protected PhotoSphereHelper.PanoramaMetadata mPanoramaMetadata;
/** Used to load photo sphere metadata from image files. */
- private PanoramaMetadataLoader mPanoramaMetadataLoader = null;
+ protected PanoramaMetadataLoader mPanoramaMetadataLoader = null;
- // true if this data has a corresponding visible view.
+ /**
+ * Used for thumbnail loading optimization. True if this data
+ * has a corresponding visible view.
+ */
protected Boolean mUsing = false;
@Override
@@ -194,7 +197,7 @@ public abstract class LocalMediaData implements LocalData {
}
@Override
- public abstract int getType();
+ public abstract int getViewType();
protected abstract BitmapLoadTask getBitmapLoadTask(
ImageView v, int decodeWidth, int decodeHeight);
@@ -289,8 +292,8 @@ public abstract class LocalMediaData implements LocalData {
}
@Override
- public int getType() {
- return TYPE_PHOTO;
+ public int getViewType() {
+ return TYPE_REMOVABLE_VIEW;
}
@Override
@@ -317,6 +320,14 @@ public abstract class LocalMediaData implements LocalData {
}
@Override
+ public int getLocalDataType(int dataID) {
+ if (mPanoramaMetadata != null && mPanoramaMetadata.mUsePanoramaViewer) {
+ return LOCAL_PHOTO_SPHERE;
+ }
+ return LOCAL_IMAGE;
+ }
+
+ @Override
public boolean refresh(ContentResolver resolver) {
Cursor c = resolver.query(
getContentUri(), QUERY_PROJECTION, null, null, null);
@@ -458,8 +469,8 @@ public abstract class LocalMediaData implements LocalData {
}
@Override
- public int getType() {
- return TYPE_PHOTO;
+ public int getViewType() {
+ return TYPE_REMOVABLE_VIEW;
}
@Override
@@ -486,6 +497,11 @@ public abstract class LocalMediaData implements LocalData {
}
@Override
+ public int getLocalDataType(int dataID) {
+ return LOCAL_VIDEO;
+ }
+
+ @Override
public boolean refresh(ContentResolver resolver) {
Cursor c = resolver.query(
getContentUri(), QUERY_PROJECTION, null, null, null);