diff options
Diffstat (limited to 'src/com/android/camera/data')
| -rw-r--r-- | src/com/android/camera/data/CameraDataAdapter.java | 11 | ||||
| -rw-r--r-- | src/com/android/camera/data/LocalData.java | 20 | ||||
| -rw-r--r-- | src/com/android/camera/data/PanoramaMetadataLoader.java | 12 |
3 files changed, 18 insertions, 25 deletions
diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java index 3605f7190..e384b1512 100644 --- a/src/com/android/camera/data/CameraDataAdapter.java +++ b/src/com/android/camera/data/CameraDataAdapter.java @@ -16,6 +16,11 @@ package com.android.camera.data; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + import android.content.ContentResolver; import android.content.Context; import android.database.Cursor; @@ -28,12 +33,6 @@ import android.view.View; import com.android.camera.Storage; import com.android.camera.ui.FilmStripView.ImageData; -import com.android.gallery3d.util.LightCycleHelper.PanoramaViewHelper; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; /** * A {@link LocalDataAdapter} that provides data in the camera folder. diff --git a/src/com/android/camera/data/LocalData.java b/src/com/android/camera/data/LocalData.java index efccfe332..eb2212c2a 100644 --- a/src/com/android/camera/data/LocalData.java +++ b/src/com/android/camera/data/LocalData.java @@ -16,6 +16,10 @@ package com.android.camera.data; +import java.io.File; +import java.util.Comparator; +import java.util.Date; + import android.content.ContentResolver; import android.content.Context; import android.database.Cursor; @@ -42,13 +46,9 @@ import android.widget.ImageView; import com.android.camera.Util; import com.android.camera.data.PanoramaMetadataLoader.PanoramaMetadataCallback; import com.android.camera.ui.FilmStripView; -import com.android.gallery3d.R; -import com.android.gallery3d.util.LightCycleHelper.PanoramaMetadata; -import com.android.gallery3d.util.LightCycleHelper.PanoramaViewHelper; - -import java.io.File; -import java.util.Comparator; -import java.util.Date; +import com.android.camera.util.PhotoSphereHelper.PanoramaMetadata; +import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper; +import com.android.camera2.R; /** * An abstract interface that represents the local media data. Also implements @@ -101,16 +101,10 @@ public interface LocalData extends FilmStripView.ImageData { // Implementations below. /** -<<<<<<< HEAD * A base class for all the local media files. The bitmap is loaded in * background thread. Subclasses should implement their own background * loading thread by subclassing BitmapLoadTask and overriding * doInBackground() to return a bitmap. -======= - * A base class for all the local media files. The bitmap is loaded in background - * thread. Subclasses should implement their own background loading thread by - * sub-classing BitmapLoadTask and overriding doInBackground() to return a bitmap. ->>>>>>> Add LocalDataAdapter and wrappers. */ abstract static class LocalMediaData implements LocalData { protected long id; diff --git a/src/com/android/camera/data/PanoramaMetadataLoader.java b/src/com/android/camera/data/PanoramaMetadataLoader.java index 21b5f8a3d..fda684861 100644 --- a/src/com/android/camera/data/PanoramaMetadataLoader.java +++ b/src/com/android/camera/data/PanoramaMetadataLoader.java @@ -16,13 +16,13 @@ package com.android.camera.data; +import java.util.ArrayList; + import android.content.Context; import android.net.Uri; -import com.android.gallery3d.util.LightCycleHelper; -import com.android.gallery3d.util.LightCycleHelper.PanoramaMetadata; - -import java.util.ArrayList; +import com.android.camera.util.PhotoSphereHelper; +import com.android.camera.util.PhotoSphereHelper.PanoramaMetadata; /** * This class breaks out the off-thread panorama support. @@ -72,7 +72,7 @@ public class PanoramaMetadataLoader { (new Thread() { @Override public void run() { - onLoadingDone(LightCycleHelper.getPanoramaMetadata(context, + onLoadingDone(PhotoSphereHelper.getPanoramaMetadata(context, mMediaUri)); } }).start(); @@ -96,7 +96,7 @@ public class PanoramaMetadataLoader { mPanoramaMetadata = metadata; if (mPanoramaMetadata == null) { // Error getting panorama data from file. Treat as not panorama. - mPanoramaMetadata = LightCycleHelper.NOT_PANORAMA; + mPanoramaMetadata = PhotoSphereHelper.NOT_PANORAMA; } for (PanoramaMetadataCallback cb : mCallbacksWaiting) { cb.onPanoramaMetadataLoaded(mPanoramaMetadata); |