diff options
author | Owen Lin <owenlin@google.com> | 2012-03-14 17:27:24 +0800 |
---|---|---|
committer | Owen Lin <owenlin@google.com> | 2012-03-14 17:28:00 +0800 |
commit | 73a04ff386d590f797d95b02286442108063b569 (patch) | |
tree | f2d7e8f5b41f6edde1cd8889e256a477ae4ae746 /src/com/android/gallery3d/data | |
parent | 7e0a28c2999f2d2c0aab4ecb7a03ac3e37078724 (diff) | |
download | android_packages_apps_Snap-73a04ff386d590f797d95b02286442108063b569.tar.gz android_packages_apps_Snap-73a04ff386d590f797d95b02286442108063b569.tar.bz2 android_packages_apps_Snap-73a04ff386d590f797d95b02286442108063b569.zip |
Reorganize import for all files.
Change-Id: Ia9188bcde727e317e6a476caccaea562f0758b19
Diffstat (limited to 'src/com/android/gallery3d/data')
23 files changed, 68 insertions, 83 deletions
diff --git a/src/com/android/gallery3d/data/ChangeNotifier.java b/src/com/android/gallery3d/data/ChangeNotifier.java index 4f9f56b07..35be2dc5b 100644 --- a/src/com/android/gallery3d/data/ChangeNotifier.java +++ b/src/com/android/gallery3d/data/ChangeNotifier.java @@ -16,10 +16,10 @@ package com.android.gallery3d.data; -import com.android.gallery3d.app.GalleryApp; - import android.net.Uri; +import com.android.gallery3d.app.GalleryApp; + import java.util.concurrent.atomic.AtomicBoolean; // This handles change notification for media sets. diff --git a/src/com/android/gallery3d/data/ClusterAlbumSet.java b/src/com/android/gallery3d/data/ClusterAlbumSet.java index 16501c22b..863e94ad5 100644 --- a/src/com/android/gallery3d/data/ClusterAlbumSet.java +++ b/src/com/android/gallery3d/data/ClusterAlbumSet.java @@ -16,11 +16,11 @@ package com.android.gallery3d.data; -import com.android.gallery3d.app.GalleryApp; - import android.content.Context; import android.net.Uri; +import com.android.gallery3d.app.GalleryApp; + import java.util.ArrayList; import java.util.HashSet; diff --git a/src/com/android/gallery3d/data/ComboAlbum.java b/src/com/android/gallery3d/data/ComboAlbum.java index 6d2231168..73c8ef36c 100644 --- a/src/com/android/gallery3d/data/ComboAlbum.java +++ b/src/com/android/gallery3d/data/ComboAlbum.java @@ -16,7 +16,6 @@ package com.android.gallery3d.data; -import com.android.gallery3d.app.GalleryApp; import com.android.gallery3d.util.Future; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/data/DataManager.java b/src/com/android/gallery3d/data/DataManager.java index e08fdedb6..e6e97e9bf 100644 --- a/src/com/android/gallery3d/data/DataManager.java +++ b/src/com/android/gallery3d/data/DataManager.java @@ -16,16 +16,16 @@ package com.android.gallery3d.data; +import android.database.ContentObserver; +import android.net.Uri; +import android.os.Handler; + import com.android.gallery3d.app.GalleryApp; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.MediaSet.ItemConsumer; import com.android.gallery3d.data.MediaSource.PathId; import com.android.gallery3d.picasasource.PicasaSource; -import android.database.ContentObserver; -import android.net.Uri; -import android.os.Handler; - import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; diff --git a/src/com/android/gallery3d/data/DownloadCache.java b/src/com/android/gallery3d/data/DownloadCache.java index 9646a6383..7505dac34 100644 --- a/src/com/android/gallery3d/data/DownloadCache.java +++ b/src/com/android/gallery3d/data/DownloadCache.java @@ -16,6 +16,12 @@ package com.android.gallery3d.data; +import android.content.ContentValues; +import android.content.Context; +import android.database.Cursor; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; + import com.android.gallery3d.app.GalleryApp; import com.android.gallery3d.common.LruCache; import com.android.gallery3d.common.Utils; @@ -27,17 +33,10 @@ import com.android.gallery3d.util.ThreadPool.CancelListener; import com.android.gallery3d.util.ThreadPool.Job; import com.android.gallery3d.util.ThreadPool.JobContext; -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteOpenHelper; - import java.io.File; import java.net.URL; import java.util.HashMap; import java.util.HashSet; -import java.util.WeakHashMap; public class DownloadCache { private static final String TAG = "DownloadCache"; diff --git a/src/com/android/gallery3d/data/DownloadUtils.java b/src/com/android/gallery3d/data/DownloadUtils.java index e055c442f..9e35c4593 100644 --- a/src/com/android/gallery3d/data/DownloadUtils.java +++ b/src/com/android/gallery3d/data/DownloadUtils.java @@ -20,7 +20,6 @@ import com.android.gallery3d.common.Utils; import com.android.gallery3d.util.ThreadPool.CancelListener; import com.android.gallery3d.util.ThreadPool.JobContext; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/src/com/android/gallery3d/data/Exif.java b/src/com/android/gallery3d/data/Exif.java index 6f314df13..ba5862a86 100644 --- a/src/com/android/gallery3d/data/Exif.java +++ b/src/com/android/gallery3d/data/Exif.java @@ -18,8 +18,8 @@ package com.android.gallery3d.data; import android.util.Log; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; public class Exif { private static final String TAG = "CameraExif"; diff --git a/src/com/android/gallery3d/data/LocalAlbum.java b/src/com/android/gallery3d/data/LocalAlbum.java index 28364cb71..1030c84e0 100644 --- a/src/com/android/gallery3d/data/LocalAlbum.java +++ b/src/com/android/gallery3d/data/LocalAlbum.java @@ -16,12 +16,6 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; -import com.android.gallery3d.app.GalleryApp; -import com.android.gallery3d.common.Utils; -import com.android.gallery3d.util.GalleryUtils; -import com.android.gallery3d.util.MediaSetUtils; - import android.content.ContentResolver; import android.content.res.Resources; import android.database.Cursor; @@ -31,6 +25,12 @@ import android.provider.MediaStore.Images.ImageColumns; import android.provider.MediaStore.Video; import android.provider.MediaStore.Video.VideoColumns; +import com.android.gallery3d.R; +import com.android.gallery3d.app.GalleryApp; +import com.android.gallery3d.common.Utils; +import com.android.gallery3d.util.GalleryUtils; +import com.android.gallery3d.util.MediaSetUtils; + import java.util.ArrayList; // LocalAlbumSet lists all media items in one bucket on local storage. diff --git a/src/com/android/gallery3d/data/LocalAlbumSet.java b/src/com/android/gallery3d/data/LocalAlbumSet.java index a8c1aa765..a81391c4e 100644 --- a/src/com/android/gallery3d/data/LocalAlbumSet.java +++ b/src/com/android/gallery3d/data/LocalAlbumSet.java @@ -16,12 +16,6 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; -import com.android.gallery3d.app.GalleryApp; -import com.android.gallery3d.common.Utils; -import com.android.gallery3d.util.GalleryUtils; -import com.android.gallery3d.util.MediaSetUtils; - import android.content.ContentResolver; import android.database.Cursor; import android.net.Uri; @@ -31,10 +25,14 @@ import android.provider.MediaStore.Images; import android.provider.MediaStore.Images.ImageColumns; import android.provider.MediaStore.Video; +import com.android.gallery3d.R; +import com.android.gallery3d.app.GalleryApp; +import com.android.gallery3d.common.Utils; +import com.android.gallery3d.util.GalleryUtils; +import com.android.gallery3d.util.MediaSetUtils; + import java.util.ArrayList; -import java.util.Arrays; import java.util.Comparator; -import java.util.HashSet; // LocalAlbumSet lists all image or video albums in the local storage. // The path should be "/local/image", "local/video" or "/local/all" diff --git a/src/com/android/gallery3d/data/LocalMediaItem.java b/src/com/android/gallery3d/data/LocalMediaItem.java index a76fedf32..2749ebe55 100644 --- a/src/com/android/gallery3d/data/LocalMediaItem.java +++ b/src/com/android/gallery3d/data/LocalMediaItem.java @@ -16,10 +16,10 @@ package com.android.gallery3d.data; -import com.android.gallery3d.util.GalleryUtils; - import android.database.Cursor; +import com.android.gallery3d.util.GalleryUtils; + import java.text.DateFormat; import java.util.Date; diff --git a/src/com/android/gallery3d/data/LocalVideo.java b/src/com/android/gallery3d/data/LocalVideo.java index c45949ea5..0ba59f581 100644 --- a/src/com/android/gallery3d/data/LocalVideo.java +++ b/src/com/android/gallery3d/data/LocalVideo.java @@ -16,26 +16,20 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; -import com.android.gallery3d.app.GalleryApp; -import com.android.gallery3d.common.BitmapUtils; -import com.android.gallery3d.util.UpdateHelper; -import com.android.gallery3d.util.GalleryUtils; -import com.android.gallery3d.util.ThreadPool.Job; -import com.android.gallery3d.util.ThreadPool.JobContext; - import android.content.ContentResolver; import android.database.Cursor; import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.graphics.BitmapRegionDecoder; -import android.graphics.Canvas; -import android.graphics.Paint; import android.net.Uri; import android.provider.MediaStore.Video; import android.provider.MediaStore.Video.VideoColumns; -import java.io.File; +import com.android.gallery3d.app.GalleryApp; +import com.android.gallery3d.common.BitmapUtils; +import com.android.gallery3d.util.GalleryUtils; +import com.android.gallery3d.util.ThreadPool.Job; +import com.android.gallery3d.util.ThreadPool.JobContext; +import com.android.gallery3d.util.UpdateHelper; // LocalVideo represents a video in the local storage. public class LocalVideo extends LocalMediaItem { diff --git a/src/com/android/gallery3d/data/LocationClustering.java b/src/com/android/gallery3d/data/LocationClustering.java index 9f3a35890..b36bd63da 100644 --- a/src/com/android/gallery3d/data/LocationClustering.java +++ b/src/com/android/gallery3d/data/LocationClustering.java @@ -16,16 +16,16 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; -import com.android.gallery3d.util.ReverseGeocoder; -import com.android.gallery3d.util.GalleryUtils; - import android.content.Context; import android.os.Handler; import android.os.Looper; import android.util.FloatMath; import android.widget.Toast; +import com.android.gallery3d.R; +import com.android.gallery3d.util.GalleryUtils; +import com.android.gallery3d.util.ReverseGeocoder; + import java.util.ArrayList; class LocationClustering extends Clustering { diff --git a/src/com/android/gallery3d/data/MediaDetails.java b/src/com/android/gallery3d/data/MediaDetails.java index 8f0ca7d7b..9663dd0e6 100644 --- a/src/com/android/gallery3d/data/MediaDetails.java +++ b/src/com/android/gallery3d/data/MediaDetails.java @@ -16,15 +16,15 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; - import android.media.ExifInterface; +import com.android.gallery3d.R; + import java.io.IOException; import java.util.HashMap; import java.util.Iterator; -import java.util.TreeMap; import java.util.Map.Entry; +import java.util.TreeMap; public class MediaDetails implements Iterable<Entry<Integer, Object>> { @SuppressWarnings("unused") diff --git a/src/com/android/gallery3d/data/MediaSource.java b/src/com/android/gallery3d/data/MediaSource.java index ae98e0fcc..07479a7d0 100644 --- a/src/com/android/gallery3d/data/MediaSource.java +++ b/src/com/android/gallery3d/data/MediaSource.java @@ -16,10 +16,10 @@ package com.android.gallery3d.data; -import com.android.gallery3d.data.MediaSet.ItemConsumer; - import android.net.Uri; +import com.android.gallery3d.data.MediaSet.ItemConsumer; + import java.util.ArrayList; public abstract class MediaSource { diff --git a/src/com/android/gallery3d/data/MtpClient.java b/src/com/android/gallery3d/data/MtpClient.java index 6991c1637..2d58df24a 100644 --- a/src/com/android/gallery3d/data/MtpClient.java +++ b/src/com/android/gallery3d/data/MtpClient.java @@ -27,13 +27,10 @@ import android.hardware.usb.UsbDeviceConnection; import android.hardware.usb.UsbInterface; import android.hardware.usb.UsbManager; import android.mtp.MtpDevice; -import android.mtp.MtpDeviceInfo; import android.mtp.MtpObjectInfo; import android.mtp.MtpStorageInfo; -import android.os.ParcelFileDescriptor; import android.util.Log; -import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/com/android/gallery3d/data/MtpContext.java b/src/com/android/gallery3d/data/MtpContext.java index 652849445..ee5cf7e6a 100644 --- a/src/com/android/gallery3d/data/MtpContext.java +++ b/src/com/android/gallery3d/data/MtpContext.java @@ -1,10 +1,6 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; -import com.android.gallery3d.util.GalleryUtils; - import android.content.Context; -import android.hardware.usb.UsbDevice; import android.media.MediaScannerConnection; import android.media.MediaScannerConnection.MediaScannerConnectionClient; import android.mtp.MtpObjectInfo; @@ -13,6 +9,9 @@ import android.os.Environment; import android.util.Log; import android.widget.Toast; +import com.android.gallery3d.R; +import com.android.gallery3d.util.GalleryUtils; + import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/gallery3d/data/MtpDevice.java b/src/com/android/gallery3d/data/MtpDevice.java index e654583c5..f43ae2b4d 100644 --- a/src/com/android/gallery3d/data/MtpDevice.java +++ b/src/com/android/gallery3d/data/MtpDevice.java @@ -16,8 +16,6 @@ package com.android.gallery3d.data; -import com.android.gallery3d.app.GalleryApp; - import android.hardware.usb.UsbDevice; import android.mtp.MtpConstants; import android.mtp.MtpObjectInfo; @@ -25,6 +23,8 @@ import android.mtp.MtpStorageInfo; import android.net.Uri; import android.util.Log; +import com.android.gallery3d.app.GalleryApp; + import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/gallery3d/data/MtpDeviceSet.java b/src/com/android/gallery3d/data/MtpDeviceSet.java index 6521623d4..0d0e67ec3 100644 --- a/src/com/android/gallery3d/data/MtpDeviceSet.java +++ b/src/com/android/gallery3d/data/MtpDeviceSet.java @@ -16,14 +16,14 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; -import com.android.gallery3d.app.GalleryApp; -import com.android.gallery3d.util.MediaSetUtils; - import android.mtp.MtpDeviceInfo; import android.net.Uri; import android.util.Log; +import com.android.gallery3d.R; +import com.android.gallery3d.app.GalleryApp; +import com.android.gallery3d.util.MediaSetUtils; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/com/android/gallery3d/data/MtpImage.java b/src/com/android/gallery3d/data/MtpImage.java index bdbaecd22..96b4d9f12 100644 --- a/src/com/android/gallery3d/data/MtpImage.java +++ b/src/com/android/gallery3d/data/MtpImage.java @@ -16,12 +16,6 @@ package com.android.gallery3d.data; -import com.android.gallery3d.app.GalleryApp; -import com.android.gallery3d.provider.GalleryProvider; -import com.android.gallery3d.util.ThreadPool; -import com.android.gallery3d.util.ThreadPool.Job; -import com.android.gallery3d.util.ThreadPool.JobContext; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapRegionDecoder; @@ -30,6 +24,12 @@ import android.mtp.MtpObjectInfo; import android.net.Uri; import android.util.Log; +import com.android.gallery3d.app.GalleryApp; +import com.android.gallery3d.provider.GalleryProvider; +import com.android.gallery3d.util.ThreadPool; +import com.android.gallery3d.util.ThreadPool.Job; +import com.android.gallery3d.util.ThreadPool.JobContext; + import java.text.DateFormat; import java.util.Date; diff --git a/src/com/android/gallery3d/data/SizeClustering.java b/src/com/android/gallery3d/data/SizeClustering.java index 7e24b337b..2dbe49dfd 100644 --- a/src/com/android/gallery3d/data/SizeClustering.java +++ b/src/com/android/gallery3d/data/SizeClustering.java @@ -16,11 +16,11 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; - import android.content.Context; import android.content.res.Resources; +import com.android.gallery3d.R; + import java.util.ArrayList; public class SizeClustering extends Clustering { diff --git a/src/com/android/gallery3d/data/TagClustering.java b/src/com/android/gallery3d/data/TagClustering.java index c87305132..849f88510 100644 --- a/src/com/android/gallery3d/data/TagClustering.java +++ b/src/com/android/gallery3d/data/TagClustering.java @@ -16,10 +16,10 @@ package com.android.gallery3d.data; -import com.android.gallery3d.R; - import android.content.Context; +import com.android.gallery3d.R; + import java.util.ArrayList; import java.util.Map; import java.util.TreeMap; diff --git a/src/com/android/gallery3d/data/TimeClustering.java b/src/com/android/gallery3d/data/TimeClustering.java index 1ccf14c13..9a0ae1d53 100644 --- a/src/com/android/gallery3d/data/TimeClustering.java +++ b/src/com/android/gallery3d/data/TimeClustering.java @@ -16,13 +16,13 @@ package com.android.gallery3d.data; -import com.android.gallery3d.common.Utils; -import com.android.gallery3d.util.GalleryUtils; - import android.content.Context; import android.text.format.DateFormat; import android.text.format.DateUtils; +import com.android.gallery3d.common.Utils; +import com.android.gallery3d.util.GalleryUtils; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/src/com/android/gallery3d/data/UriSource.java b/src/com/android/gallery3d/data/UriSource.java index ac62b93a7..ac53dd5e0 100644 --- a/src/com/android/gallery3d/data/UriSource.java +++ b/src/com/android/gallery3d/data/UriSource.java @@ -16,10 +16,10 @@ package com.android.gallery3d.data; -import com.android.gallery3d.app.GalleryApp; - import android.net.Uri; +import com.android.gallery3d.app.GalleryApp; + import java.net.URLDecoder; import java.net.URLEncoder; |