diff options
author | Angus Kong <shkong@google.com> | 2013-08-07 14:52:56 -0700 |
---|---|---|
committer | Angus Kong <shkong@google.com> | 2013-08-07 14:57:07 -0700 |
commit | bd26069d391830856c57c2141cd2efbc8423d871 (patch) | |
tree | 4608c69639ef9c9aacf8ad4902541cb6b453a2f7 /src/com/android/camera/data/CameraDataAdapter.java | |
parent | 764b07e6d5143b09c6f1bdd5504a89b81f7a7e74 (diff) | |
download | android_packages_apps_Snap-bd26069d391830856c57c2141cd2efbc8423d871.tar.gz android_packages_apps_Snap-bd26069d391830856c57c2141cd2efbc8423d871.tar.bz2 android_packages_apps_Snap-bd26069d391830856c57c2141cd2efbc8423d871.zip |
Refactor data/LocalData.
Make the design more easily understood.
Change-Id: I4f7dbe7d3f0a0534c13996b773f1767997848746
Diffstat (limited to 'src/com/android/camera/data/CameraDataAdapter.java')
-rw-r--r-- | src/com/android/camera/data/CameraDataAdapter.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java index aaf5ebe59..b125bdc2e 100644 --- a/src/com/android/camera/data/CameraDataAdapter.java +++ b/src/com/android/camera/data/CameraDataAdapter.java @@ -146,14 +146,14 @@ public class CameraDataAdapter implements LocalDataAdapter { @Override public void addNewVideo(ContentResolver cr, Uri uri) { Cursor c = cr.query(uri, - LocalData.Video.QUERY_PROJECTION, + LocalMediaData.VideoData.QUERY_PROJECTION, MediaStore.Images.Media.DATA + " like ? ", CAMERA_PATH, - LocalData.Video.QUERY_ORDER); + LocalMediaData.VideoData.QUERY_ORDER); if (c == null || !c.moveToFirst()) { return; } int pos = findDataByContentUri(uri); - LocalData.Video newData = LocalData.Video.buildFromCursor(c); + LocalMediaData.VideoData newData = LocalMediaData.VideoData.buildFromCursor(c); if (pos != -1) { // A duplicate one, just do a substitute. updateData(pos, newData); @@ -167,14 +167,14 @@ public class CameraDataAdapter implements LocalDataAdapter { @Override public void addNewPhoto(ContentResolver cr, Uri uri) { Cursor c = cr.query(uri, - LocalData.Photo.QUERY_PROJECTION, + LocalMediaData.PhotoData.QUERY_PROJECTION, MediaStore.Images.Media.DATA + " like ? ", CAMERA_PATH, - LocalData.Photo.QUERY_ORDER); + LocalMediaData.PhotoData.QUERY_ORDER); if (c == null || !c.moveToFirst()) { return; } int pos = findDataByContentUri(uri); - LocalData.Photo newData = LocalData.Photo.buildFromCursor(c); + LocalMediaData.PhotoData newData = LocalMediaData.PhotoData.buildFromCursor(c); if (pos != -1) { // a duplicate one, just do a substitute. Log.v(TAG, "found duplicate photo"); @@ -288,19 +288,19 @@ public class CameraDataAdapter implements LocalDataAdapter { List<LocalData> l = new ArrayList<LocalData>(); // Photos Cursor c = resolver[0].query( - LocalData.Photo.CONTENT_URI, - LocalData.Photo.QUERY_PROJECTION, + LocalMediaData.PhotoData.CONTENT_URI, + LocalMediaData.PhotoData.QUERY_PROJECTION, MediaStore.Images.Media.DATA + " like ? ", CAMERA_PATH, - LocalData.Photo.QUERY_ORDER); + LocalMediaData.PhotoData.QUERY_ORDER); if (c != null && c.moveToFirst()) { // build up the list. while (true) { - LocalData data = LocalData.Photo.buildFromCursor(c); + LocalData data = LocalMediaData.PhotoData.buildFromCursor(c); if (data != null) { l.add(data); } else { Log.e(TAG, "Error loading data:" - + c.getString(LocalData.Photo.COL_DATA)); + + c.getString(LocalMediaData.PhotoData.COL_DATA)); } if (c.isLast()) { break; @@ -313,20 +313,20 @@ public class CameraDataAdapter implements LocalDataAdapter { } c = resolver[0].query( - LocalData.Video.CONTENT_URI, - LocalData.Video.QUERY_PROJECTION, + LocalMediaData.VideoData.CONTENT_URI, + LocalMediaData.VideoData.QUERY_PROJECTION, MediaStore.Video.Media.DATA + " like ? ", CAMERA_PATH, - LocalData.Video.QUERY_ORDER); + LocalMediaData.VideoData.QUERY_ORDER); if (c != null && c.moveToFirst()) { // build up the list. c.moveToFirst(); while (true) { - LocalData data = LocalData.Video.buildFromCursor(c); + LocalData data = LocalMediaData.VideoData.buildFromCursor(c); if (data != null) { l.add(data); } else { Log.e(TAG, "Error loading data:" - + c.getString(LocalData.Video.COL_DATA)); + + c.getString(LocalMediaData.VideoData.COL_DATA)); } if (!c.isLast()) { c.moveToNext(); |