diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-08-06 11:43:02 -0700 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2013-08-06 11:43:02 -0700 |
commit | 8e963a5a6016d246184ed65906f9d103e92b17e2 (patch) | |
tree | 02eb244ea4a20d9aa8e43916a40b876be8935d11 /src/com/android/camera/data/LocalData.java | |
parent | 4fc90b07dcf316c7ce6c5313af8202e84bc85603 (diff) | |
download | android_packages_apps_Snap-8e963a5a6016d246184ed65906f9d103e92b17e2.tar.gz android_packages_apps_Snap-8e963a5a6016d246184ed65906f9d103e92b17e2.tar.bz2 android_packages_apps_Snap-8e963a5a6016d246184ed65906f9d103e92b17e2.zip |
This removes all non-Camera stuff from Camera2.
Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.
Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
Diffstat (limited to 'src/com/android/camera/data/LocalData.java')
-rw-r--r-- | src/com/android/camera/data/LocalData.java | 20 |
1 files changed, 7 insertions, 13 deletions
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; |