From 73a04ff386d590f797d95b02286442108063b569 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Wed, 14 Mar 2012 17:27:24 +0800 Subject: Reorganize import for all files. Change-Id: Ia9188bcde727e317e6a476caccaea562f0758b19 --- src/com/android/gallery3d/anim/Animation.java | 4 +-- src/com/android/gallery3d/app/AlbumPicker.java | 6 ++--- src/com/android/gallery3d/app/Config.java | 8 +++--- src/com/android/gallery3d/app/DialogPicker.java | 5 ++-- src/com/android/gallery3d/app/EyePosition.java | 6 ++--- .../android/gallery3d/app/GalleryActionBar.java | 4 +-- src/com/android/gallery3d/app/GalleryActivity.java | 1 - src/com/android/gallery3d/app/GalleryApp.java | 10 ++++---- src/com/android/gallery3d/app/GalleryAppImpl.java | 6 ++--- src/com/android/gallery3d/app/GalleryContext.java | 8 +++--- src/com/android/gallery3d/app/ManageCachePage.java | 30 +++++++++++----------- .../gallery3d/app/MovieControllerOverlay.java | 4 +-- src/com/android/gallery3d/app/PackagesMonitor.java | 4 +-- .../android/gallery3d/app/PhotoDataAdapter.java | 10 ++++---- src/com/android/gallery3d/app/PickerActivity.java | 8 +++--- .../gallery3d/app/SinglePhotoDataAdapter.java | 14 +++++----- src/com/android/gallery3d/app/SlideshowDream.java | 9 +------ src/com/android/gallery3d/app/SlideshowPage.java | 1 - src/com/android/gallery3d/app/StateManager.java | 4 +-- src/com/android/gallery3d/app/TimeBar.java | 6 ++--- src/com/android/gallery3d/data/ChangeNotifier.java | 4 +-- .../android/gallery3d/data/ClusterAlbumSet.java | 4 +-- src/com/android/gallery3d/data/ComboAlbum.java | 1 - src/com/android/gallery3d/data/DataManager.java | 8 +++--- src/com/android/gallery3d/data/DownloadCache.java | 13 +++++----- src/com/android/gallery3d/data/DownloadUtils.java | 1 - src/com/android/gallery3d/data/Exif.java | 2 +- src/com/android/gallery3d/data/LocalAlbum.java | 12 ++++----- src/com/android/gallery3d/data/LocalAlbumSet.java | 14 +++++----- src/com/android/gallery3d/data/LocalMediaItem.java | 4 +-- src/com/android/gallery3d/data/LocalVideo.java | 18 +++++-------- .../android/gallery3d/data/LocationClustering.java | 8 +++--- src/com/android/gallery3d/data/MediaDetails.java | 6 ++--- src/com/android/gallery3d/data/MediaSource.java | 4 +-- src/com/android/gallery3d/data/MtpClient.java | 3 --- src/com/android/gallery3d/data/MtpContext.java | 7 +++-- src/com/android/gallery3d/data/MtpDevice.java | 4 +-- src/com/android/gallery3d/data/MtpDeviceSet.java | 8 +++--- src/com/android/gallery3d/data/MtpImage.java | 12 ++++----- src/com/android/gallery3d/data/SizeClustering.java | 4 +-- src/com/android/gallery3d/data/TagClustering.java | 4 +-- src/com/android/gallery3d/data/TimeClustering.java | 6 ++--- src/com/android/gallery3d/data/UriSource.java | 4 +-- .../android/gallery3d/gadget/LocalPhotoSource.java | 16 ++++++------ .../android/gallery3d/gadget/MediaSetSource.java | 8 +++--- .../gallery3d/gadget/PhotoAppWidgetProvider.java | 6 ++--- .../gallery3d/gadget/WidgetClickHandler.java | 6 ++--- .../android/gallery3d/gadget/WidgetConfigure.java | 10 ++++---- .../gallery3d/gadget/WidgetDatabaseHelper.java | 4 +-- .../android/gallery3d/gadget/WidgetService.java | 14 +++++----- src/com/android/gallery3d/gadget/WidgetSource.java | 4 +-- .../gallery3d/gadget/WidgetTypeChooser.java | 4 +-- src/com/android/gallery3d/gadget/WidgetUtils.java | 10 ++++---- .../gallery3d/provider/GalleryProvider.java | 1 - .../android/gallery3d/ui/ActionModeHandler.java | 2 +- src/com/android/gallery3d/ui/BitmapTexture.java | 4 +-- .../android/gallery3d/ui/BitmapTileProvider.java | 6 ++--- .../gallery3d/ui/CacheStorageUsageInfo.java | 6 ++--- src/com/android/gallery3d/ui/CanvasTexture.java | 2 +- src/com/android/gallery3d/ui/CropView.java | 11 ++++---- src/com/android/gallery3d/ui/CustomMenu.java | 5 ++-- src/com/android/gallery3d/ui/DetailsHelper.java | 6 ++--- src/com/android/gallery3d/ui/EdgeEffect.java | 5 ++-- src/com/android/gallery3d/ui/FadeInTexture.java | 2 -- src/com/android/gallery3d/ui/FilmStripView.java | 8 +++--- src/com/android/gallery3d/ui/FlingScroller.java | 1 - src/com/android/gallery3d/ui/GLCanvasImpl.java | 7 ++--- src/com/android/gallery3d/ui/GLRootView.java | 13 +++++----- src/com/android/gallery3d/ui/GLView.java | 6 ++--- src/com/android/gallery3d/ui/GridDrawer.java | 6 ++--- src/com/android/gallery3d/ui/HighlightDrawer.java | 5 ++-- src/com/android/gallery3d/ui/IconDrawer.java | 4 +-- .../gallery3d/ui/ImportCompleteListener.java | 8 +++--- .../android/gallery3d/ui/ManageCacheDrawer.java | 5 ++-- src/com/android/gallery3d/ui/NinePatchTexture.java | 5 ++-- src/com/android/gallery3d/ui/Paper.java | 9 ++----- src/com/android/gallery3d/ui/PhotoView.java | 10 ++++---- .../android/gallery3d/ui/PositionController.java | 9 +++---- .../android/gallery3d/ui/PositionRepository.java | 4 +-- src/com/android/gallery3d/ui/ProgressSpinner.java | 4 +-- src/com/android/gallery3d/ui/ResourceTexture.java | 4 +-- src/com/android/gallery3d/ui/ScrollBarView.java | 2 -- src/com/android/gallery3d/ui/ScrollerHelper.java | 4 +-- src/com/android/gallery3d/ui/SelectionDrawer.java | 5 ++-- src/com/android/gallery3d/ui/SlideshowView.java | 7 ++--- src/com/android/gallery3d/ui/StringTexture.java | 2 +- src/com/android/gallery3d/ui/StripDrawer.java | 6 ++--- .../android/gallery3d/ui/SynchronizedHandler.java | 4 +-- src/com/android/gallery3d/ui/TileImageView.java | 2 -- src/com/android/gallery3d/ui/UploadedTexture.java | 5 ++-- src/com/android/gallery3d/util/CacheManager.java | 4 +-- src/com/android/gallery3d/util/GalleryUtils.java | 14 +++++----- src/com/android/gallery3d/util/IdentityCache.java | 2 +- src/com/android/gallery3d/util/MediaSetUtils.java | 4 +-- src/com/android/gallery3d/util/Profile.java | 3 --- src/com/android/gallery3d/util/ProfileData.java | 4 +-- .../android/gallery3d/util/ReverseGeocoder.java | 4 +-- 97 files changed, 283 insertions(+), 328 deletions(-) (limited to 'src/com') diff --git a/src/com/android/gallery3d/anim/Animation.java b/src/com/android/gallery3d/anim/Animation.java index bd5a6cd72..cc117bbce 100644 --- a/src/com/android/gallery3d/anim/Animation.java +++ b/src/com/android/gallery3d/anim/Animation.java @@ -16,10 +16,10 @@ package com.android.gallery3d.anim; -import com.android.gallery3d.common.Utils; - import android.view.animation.Interpolator; +import com.android.gallery3d.common.Utils; + // Animation calculates a value according to the current input time. // // 1. First we need to use setDuration(int) to set the duration of the diff --git a/src/com/android/gallery3d/app/AlbumPicker.java b/src/com/android/gallery3d/app/AlbumPicker.java index ef5847e16..7509e63cb 100644 --- a/src/com/android/gallery3d/app/AlbumPicker.java +++ b/src/com/android/gallery3d/app/AlbumPicker.java @@ -16,12 +16,12 @@ package com.android.gallery3d.app; -import com.android.gallery3d.R; -import com.android.gallery3d.data.DataManager; - import android.content.Intent; import android.os.Bundle; +import com.android.gallery3d.R; +import com.android.gallery3d.data.DataManager; + public class AlbumPicker extends PickerActivity { public static final String KEY_ALBUM_PATH = "album-path"; diff --git a/src/com/android/gallery3d/app/Config.java b/src/com/android/gallery3d/app/Config.java index 914ea5514..3cc045ccd 100644 --- a/src/com/android/gallery3d/app/Config.java +++ b/src/com/android/gallery3d/app/Config.java @@ -16,13 +16,13 @@ package com.android.gallery3d.app; -import com.android.gallery3d.R; -import com.android.gallery3d.ui.SlotView; -import com.android.gallery3d.ui.AlbumSetView; - import android.content.Context; import android.content.res.Resources; +import com.android.gallery3d.R; +import com.android.gallery3d.ui.AlbumSetView; +import com.android.gallery3d.ui.SlotView; + final class Config { public static class AlbumSetPage { private static AlbumSetPage sInstance; diff --git a/src/com/android/gallery3d/app/DialogPicker.java b/src/com/android/gallery3d/app/DialogPicker.java index 8a5782478..7ca86e5b4 100644 --- a/src/com/android/gallery3d/app/DialogPicker.java +++ b/src/com/android/gallery3d/app/DialogPicker.java @@ -16,12 +16,11 @@ package com.android.gallery3d.app; -import com.android.gallery3d.R; -import com.android.gallery3d.util.GalleryUtils; - import android.content.Intent; import android.os.Bundle; +import com.android.gallery3d.util.GalleryUtils; + public class DialogPicker extends PickerActivity { @Override diff --git a/src/com/android/gallery3d/app/EyePosition.java b/src/com/android/gallery3d/app/EyePosition.java index f9713e179..89e08468c 100644 --- a/src/com/android/gallery3d/app/EyePosition.java +++ b/src/com/android/gallery3d/app/EyePosition.java @@ -16,9 +16,6 @@ package com.android.gallery3d.app; -import com.android.gallery3d.common.Utils; -import com.android.gallery3d.util.GalleryUtils; - import android.content.Context; import android.hardware.Sensor; import android.hardware.SensorEvent; @@ -30,6 +27,9 @@ import android.view.Display; import android.view.Surface; import android.view.WindowManager; +import com.android.gallery3d.common.Utils; +import com.android.gallery3d.util.GalleryUtils; + public class EyePosition { private static final String TAG = "EyePosition"; diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java index cfc30580a..93b6e8b1e 100644 --- a/src/com/android/gallery3d/app/GalleryActionBar.java +++ b/src/com/android/gallery3d/app/GalleryActionBar.java @@ -16,8 +16,6 @@ package com.android.gallery3d.app; -import com.android.gallery3d.R; - import android.app.ActionBar; import android.app.Activity; import android.app.AlertDialog; @@ -32,6 +30,8 @@ import android.widget.BaseAdapter; import android.widget.ShareActionProvider; import android.widget.TextView; +import com.android.gallery3d.R; + import java.util.ArrayList; public class GalleryActionBar implements ActionBar.OnNavigationListener { diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java index a5e21eae0..f41811b02 100644 --- a/src/com/android/gallery3d/app/GalleryActivity.java +++ b/src/com/android/gallery3d/app/GalleryActivity.java @@ -17,7 +17,6 @@ package com.android.gallery3d.app; import com.android.gallery3d.ui.GLRoot; -import com.android.gallery3d.ui.PositionRepository; public interface GalleryActivity extends GalleryContext { public StateManager getStateManager(); diff --git a/src/com/android/gallery3d/app/GalleryApp.java b/src/com/android/gallery3d/app/GalleryApp.java index b3a305e53..a2d74945f 100644 --- a/src/com/android/gallery3d/app/GalleryApp.java +++ b/src/com/android/gallery3d/app/GalleryApp.java @@ -16,16 +16,16 @@ package com.android.gallery3d.app; -import com.android.gallery3d.data.DataManager; -import com.android.gallery3d.data.DownloadCache; -import com.android.gallery3d.data.ImageCacheService; -import com.android.gallery3d.util.ThreadPool; - import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; import android.os.Looper; +import com.android.gallery3d.data.DataManager; +import com.android.gallery3d.data.DownloadCache; +import com.android.gallery3d.data.ImageCacheService; +import com.android.gallery3d.util.ThreadPool; + public interface GalleryApp { public DataManager getDataManager(); public ImageCacheService getImageCacheService(); diff --git a/src/com/android/gallery3d/app/GalleryAppImpl.java b/src/com/android/gallery3d/app/GalleryAppImpl.java index 956ab63bf..ac551dd95 100644 --- a/src/com/android/gallery3d/app/GalleryAppImpl.java +++ b/src/com/android/gallery3d/app/GalleryAppImpl.java @@ -16,6 +16,9 @@ package com.android.gallery3d.app; +import android.app.Application; +import android.content.Context; + import com.android.gallery3d.data.DataManager; import com.android.gallery3d.data.DownloadCache; import com.android.gallery3d.data.ImageCacheService; @@ -24,9 +27,6 @@ import com.android.gallery3d.picasasource.PicasaSource; import com.android.gallery3d.util.GalleryUtils; import com.android.gallery3d.util.ThreadPool; -import android.app.Application; -import android.content.Context; - import java.io.File; public class GalleryAppImpl extends Application implements GalleryApp { diff --git a/src/com/android/gallery3d/app/GalleryContext.java b/src/com/android/gallery3d/app/GalleryContext.java index 7721b7d5e..06f4fe4d1 100644 --- a/src/com/android/gallery3d/app/GalleryContext.java +++ b/src/com/android/gallery3d/app/GalleryContext.java @@ -16,15 +16,13 @@ package com.android.gallery3d.app; -import com.android.gallery3d.data.DataManager; -import com.android.gallery3d.data.ImageCacheService; -import com.android.gallery3d.util.ThreadPool; - -import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; import android.os.Looper; +import com.android.gallery3d.data.DataManager; +import com.android.gallery3d.util.ThreadPool; + public interface GalleryContext { public DataManager getDataManager(); diff --git a/src/com/android/gallery3d/app/ManageCachePage.java b/src/com/android/gallery3d/app/ManageCachePage.java index 225323636..4134e3273 100644 --- a/src/com/android/gallery3d/app/ManageCachePage.java +++ b/src/com/android/gallery3d/app/ManageCachePage.java @@ -16,6 +16,21 @@ package com.android.gallery3d.app; +import android.app.Activity; +import android.content.Context; +import android.content.res.Configuration; +import android.os.Bundle; +import android.os.Handler; +import android.os.Message; +import android.text.format.Formatter; +import android.view.LayoutInflater; +import android.view.View; +import android.view.View.OnClickListener; +import android.widget.FrameLayout; +import android.widget.ProgressBar; +import android.widget.TextView; +import android.widget.Toast; + import com.android.gallery3d.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.MediaObject; @@ -36,21 +51,6 @@ import com.android.gallery3d.util.GalleryUtils; import com.android.gallery3d.util.ThreadPool.Job; import com.android.gallery3d.util.ThreadPool.JobContext; -import android.app.Activity; -import android.content.Context; -import android.content.res.Configuration; -import android.os.Bundle; -import android.os.Handler; -import android.os.Message; -import android.text.format.Formatter; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.FrameLayout; -import android.widget.ProgressBar; -import android.widget.TextView; -import android.widget.Toast; - import java.util.ArrayList; public class ManageCachePage extends ActivityState implements diff --git a/src/com/android/gallery3d/app/MovieControllerOverlay.java b/src/com/android/gallery3d/app/MovieControllerOverlay.java index 5c820701d..92c304935 100644 --- a/src/com/android/gallery3d/app/MovieControllerOverlay.java +++ b/src/com/android/gallery3d/app/MovieControllerOverlay.java @@ -16,8 +16,6 @@ package com.android.gallery3d.app; -import com.android.gallery3d.R; - import android.content.Context; import android.os.Handler; import android.view.Gravity; @@ -37,6 +35,8 @@ import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; +import com.android.gallery3d.R; + /** * The playback controller for the Movie Player. */ diff --git a/src/com/android/gallery3d/app/PackagesMonitor.java b/src/com/android/gallery3d/app/PackagesMonitor.java index dcd9d0485..9a7a89c7b 100644 --- a/src/com/android/gallery3d/app/PackagesMonitor.java +++ b/src/com/android/gallery3d/app/PackagesMonitor.java @@ -16,14 +16,14 @@ package com.android.gallery3d.app; -import com.android.gallery3d.picasasource.PicasaSource; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.preference.PreferenceManager; +import com.android.gallery3d.picasasource.PicasaSource; + public class PackagesMonitor extends BroadcastReceiver { public static final String KEY_PACKAGES_VERSION = "packages-version"; diff --git a/src/com/android/gallery3d/app/PhotoDataAdapter.java b/src/com/android/gallery3d/app/PhotoDataAdapter.java index 0d11ee65f..0b544b95a 100644 --- a/src/com/android/gallery3d/app/PhotoDataAdapter.java +++ b/src/com/android/gallery3d/app/PhotoDataAdapter.java @@ -16,6 +16,11 @@ package com.android.gallery3d.app; +import android.graphics.Bitmap; +import android.graphics.BitmapRegionDecoder; +import android.os.Handler; +import android.os.Message; + import com.android.gallery3d.common.BitmapUtils; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.ContentListener; @@ -34,11 +39,6 @@ import com.android.gallery3d.util.ThreadPool; import com.android.gallery3d.util.ThreadPool.Job; import com.android.gallery3d.util.ThreadPool.JobContext; -import android.graphics.Bitmap; -import android.graphics.BitmapRegionDecoder; -import android.os.Handler; -import android.os.Message; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/src/com/android/gallery3d/app/PickerActivity.java b/src/com/android/gallery3d/app/PickerActivity.java index 944192dd4..703b326fe 100644 --- a/src/com/android/gallery3d/app/PickerActivity.java +++ b/src/com/android/gallery3d/app/PickerActivity.java @@ -16,10 +16,6 @@ package com.android.gallery3d.app; -import com.android.gallery3d.R; -import com.android.gallery3d.ui.GLRoot; -import com.android.gallery3d.ui.GLRootView; - import android.os.Bundle; import android.view.Menu; import android.view.MenuInflater; @@ -28,6 +24,10 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.Window; +import com.android.gallery3d.R; +import com.android.gallery3d.ui.GLRoot; +import com.android.gallery3d.ui.GLRootView; + public class PickerActivity extends AbstractGalleryActivity implements OnClickListener { diff --git a/src/com/android/gallery3d/app/SinglePhotoDataAdapter.java b/src/com/android/gallery3d/app/SinglePhotoDataAdapter.java index 0c54ada11..adad8fdf4 100644 --- a/src/com/android/gallery3d/app/SinglePhotoDataAdapter.java +++ b/src/com/android/gallery3d/app/SinglePhotoDataAdapter.java @@ -16,6 +16,13 @@ package com.android.gallery3d.app; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.BitmapRegionDecoder; +import android.graphics.Rect; +import android.os.Handler; +import android.os.Message; + import com.android.gallery3d.common.BitmapUtils; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.MediaItem; @@ -28,13 +35,6 @@ import com.android.gallery3d.util.Future; import com.android.gallery3d.util.FutureListener; import com.android.gallery3d.util.ThreadPool; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.BitmapRegionDecoder; -import android.graphics.Rect; -import android.os.Handler; -import android.os.Message; - public class SinglePhotoDataAdapter extends TileImageViewAdapter implements PhotoPage.Model { diff --git a/src/com/android/gallery3d/app/SlideshowDream.java b/src/com/android/gallery3d/app/SlideshowDream.java index f4abe86ab..c249467eb 100644 --- a/src/com/android/gallery3d/app/SlideshowDream.java +++ b/src/com/android/gallery3d/app/SlideshowDream.java @@ -1,15 +1,8 @@ package com.android.gallery3d.app; -import android.app.Activity; import android.content.Intent; -import android.support.v13.dreams.BasicDream; -import android.graphics.Canvas; -import android.net.Uri; import android.os.Bundle; -import android.os.Environment; -import android.view.View; -import android.widget.ImageView; -import android.widget.ViewFlipper; +import android.support.v13.dreams.BasicDream; public class SlideshowDream extends BasicDream { @Override diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java index 86976292a..5aa3985b2 100644 --- a/src/com/android/gallery3d/app/SlideshowPage.java +++ b/src/com/android/gallery3d/app/SlideshowPage.java @@ -17,7 +17,6 @@ package com.android.gallery3d.app; import android.app.Activity; -import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; diff --git a/src/com/android/gallery3d/app/StateManager.java b/src/com/android/gallery3d/app/StateManager.java index f17168901..b91eac644 100644 --- a/src/com/android/gallery3d/app/StateManager.java +++ b/src/com/android/gallery3d/app/StateManager.java @@ -16,8 +16,6 @@ package com.android.gallery3d.app; -import com.android.gallery3d.common.Utils; - import android.app.Activity; import android.content.Intent; import android.content.res.Configuration; @@ -26,6 +24,8 @@ import android.os.Parcelable; import android.view.Menu; import android.view.MenuItem; +import com.android.gallery3d.common.Utils; + import java.util.Stack; public class StateManager { diff --git a/src/com/android/gallery3d/app/TimeBar.java b/src/com/android/gallery3d/app/TimeBar.java index 0ac8efb42..1f5bfd96b 100644 --- a/src/com/android/gallery3d/app/TimeBar.java +++ b/src/com/android/gallery3d/app/TimeBar.java @@ -16,9 +16,6 @@ package com.android.gallery3d.app; -import com.android.gallery3d.common.Utils; -import com.android.gallery3d.R; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -29,6 +26,9 @@ import android.util.DisplayMetrics; import android.view.MotionEvent; import android.view.View; +import com.android.gallery3d.R; +import com.android.gallery3d.common.Utils; + /** * The time bar view, which includes the current and total time, the progress bar, * and the scrubber. 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> { @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; diff --git a/src/com/android/gallery3d/gadget/LocalPhotoSource.java b/src/com/android/gallery3d/gadget/LocalPhotoSource.java index ad77de5b3..6ec41f6da 100644 --- a/src/com/android/gallery3d/gadget/LocalPhotoSource.java +++ b/src/com/android/gallery3d/gadget/LocalPhotoSource.java @@ -16,14 +16,6 @@ package com.android.gallery3d.gadget; -import com.android.gallery3d.app.GalleryApp; -import com.android.gallery3d.common.Utils; -import com.android.gallery3d.data.ContentListener; -import com.android.gallery3d.data.DataManager; -import com.android.gallery3d.data.MediaItem; -import com.android.gallery3d.data.Path; -import com.android.gallery3d.util.GalleryUtils; - import android.content.ContentResolver; import android.content.Context; import android.database.ContentObserver; @@ -34,6 +26,14 @@ import android.os.Environment; import android.os.Handler; import android.provider.MediaStore.Images.Media; +import com.android.gallery3d.app.GalleryApp; +import com.android.gallery3d.common.Utils; +import com.android.gallery3d.data.ContentListener; +import com.android.gallery3d.data.DataManager; +import com.android.gallery3d.data.MediaItem; +import com.android.gallery3d.data.Path; +import com.android.gallery3d.util.GalleryUtils; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/src/com/android/gallery3d/gadget/MediaSetSource.java b/src/com/android/gallery3d/gadget/MediaSetSource.java index c1687e0c2..786092b05 100644 --- a/src/com/android/gallery3d/gadget/MediaSetSource.java +++ b/src/com/android/gallery3d/gadget/MediaSetSource.java @@ -16,16 +16,16 @@ package com.android.gallery3d.gadget; +import android.graphics.Bitmap; +import android.net.Uri; +import android.os.Binder; + import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.ContentListener; import com.android.gallery3d.data.MediaItem; import com.android.gallery3d.data.MediaObject; import com.android.gallery3d.data.MediaSet; -import android.graphics.Bitmap; -import android.net.Uri; -import android.os.Binder; - import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java b/src/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java index 814ede25f..c18652d5b 100644 --- a/src/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java +++ b/src/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java @@ -16,9 +16,6 @@ package com.android.gallery3d.gadget; -import com.android.gallery3d.R; -import com.android.gallery3d.gadget.WidgetDatabaseHelper.Entry; - import android.app.PendingIntent; import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProvider; @@ -30,6 +27,9 @@ import android.net.Uri; import android.util.Log; import android.widget.RemoteViews; +import com.android.gallery3d.R; +import com.android.gallery3d.gadget.WidgetDatabaseHelper.Entry; + public class PhotoAppWidgetProvider extends AppWidgetProvider { private static final String TAG = "WidgetProvider"; diff --git a/src/com/android/gallery3d/gadget/WidgetClickHandler.java b/src/com/android/gallery3d/gadget/WidgetClickHandler.java index 075644d5e..36575e412 100644 --- a/src/com/android/gallery3d/gadget/WidgetClickHandler.java +++ b/src/com/android/gallery3d/gadget/WidgetClickHandler.java @@ -16,9 +16,6 @@ package com.android.gallery3d.gadget; -import com.android.gallery3d.R; -import com.android.gallery3d.app.Gallery; - import android.app.Activity; import android.content.Intent; import android.content.res.AssetFileDescriptor; @@ -27,6 +24,9 @@ import android.os.Bundle; import android.util.Log; import android.widget.Toast; +import com.android.gallery3d.R; +import com.android.gallery3d.app.Gallery; + public class WidgetClickHandler extends Activity { private static final String TAG = "PhotoAppWidgetClickHandler"; diff --git a/src/com/android/gallery3d/gadget/WidgetConfigure.java b/src/com/android/gallery3d/gadget/WidgetConfigure.java index a871e24fe..5717657c2 100644 --- a/src/com/android/gallery3d/gadget/WidgetConfigure.java +++ b/src/com/android/gallery3d/gadget/WidgetConfigure.java @@ -16,11 +16,6 @@ package com.android.gallery3d.gadget; -import com.android.gallery3d.R; -import com.android.gallery3d.app.AlbumPicker; -import com.android.gallery3d.app.CropImage; -import com.android.gallery3d.app.DialogPicker; - import android.app.Activity; import android.appwidget.AppWidgetManager; import android.content.Intent; @@ -30,6 +25,11 @@ import android.net.Uri; import android.os.Bundle; import android.widget.RemoteViews; +import com.android.gallery3d.R; +import com.android.gallery3d.app.AlbumPicker; +import com.android.gallery3d.app.CropImage; +import com.android.gallery3d.app.DialogPicker; + public class WidgetConfigure extends Activity { @SuppressWarnings("unused") private static final String TAG = "WidgetConfigure"; diff --git a/src/com/android/gallery3d/gadget/WidgetDatabaseHelper.java b/src/com/android/gallery3d/gadget/WidgetDatabaseHelper.java index 164878465..b8ef7a74f 100644 --- a/src/com/android/gallery3d/gadget/WidgetDatabaseHelper.java +++ b/src/com/android/gallery3d/gadget/WidgetDatabaseHelper.java @@ -16,8 +16,6 @@ package com.android.gallery3d.gadget; -import com.android.gallery3d.common.Utils; - import android.content.ContentValues; import android.content.Context; import android.database.Cursor; @@ -28,6 +26,8 @@ import android.graphics.Bitmap; import android.net.Uri; import android.util.Log; +import com.android.gallery3d.common.Utils; + import java.io.ByteArrayOutputStream; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/gadget/WidgetService.java b/src/com/android/gallery3d/gadget/WidgetService.java index a61831ca6..eba7403c9 100644 --- a/src/com/android/gallery3d/gadget/WidgetService.java +++ b/src/com/android/gallery3d/gadget/WidgetService.java @@ -16,13 +16,6 @@ package com.android.gallery3d.gadget; -import com.android.gallery3d.R; -import com.android.gallery3d.app.GalleryApp; -import com.android.gallery3d.data.ContentListener; -import com.android.gallery3d.data.DataManager; -import com.android.gallery3d.data.MediaSet; -import com.android.gallery3d.data.Path; - import android.appwidget.AppWidgetManager; import android.content.Intent; import android.graphics.Bitmap; @@ -30,6 +23,13 @@ import android.net.Uri; import android.widget.RemoteViews; import android.widget.RemoteViewsService; +import com.android.gallery3d.R; +import com.android.gallery3d.app.GalleryApp; +import com.android.gallery3d.data.ContentListener; +import com.android.gallery3d.data.DataManager; +import com.android.gallery3d.data.MediaSet; +import com.android.gallery3d.data.Path; + public class WidgetService extends RemoteViewsService { @SuppressWarnings("unused") diff --git a/src/com/android/gallery3d/gadget/WidgetSource.java b/src/com/android/gallery3d/gadget/WidgetSource.java index 8b8eb79dc..92874c740 100644 --- a/src/com/android/gallery3d/gadget/WidgetSource.java +++ b/src/com/android/gallery3d/gadget/WidgetSource.java @@ -16,11 +16,11 @@ package com.android.gallery3d.gadget; -import com.android.gallery3d.data.ContentListener; - import android.graphics.Bitmap; import android.net.Uri; +import com.android.gallery3d.data.ContentListener; + public interface WidgetSource { public int size(); public Bitmap getImage(int index); diff --git a/src/com/android/gallery3d/gadget/WidgetTypeChooser.java b/src/com/android/gallery3d/gadget/WidgetTypeChooser.java index c4bca60d0..1694f1c04 100644 --- a/src/com/android/gallery3d/gadget/WidgetTypeChooser.java +++ b/src/com/android/gallery3d/gadget/WidgetTypeChooser.java @@ -16,8 +16,6 @@ package com.android.gallery3d.gadget; -import com.android.gallery3d.R; - import android.app.Activity; import android.content.Intent; import android.os.Bundle; @@ -27,6 +25,8 @@ import android.widget.Button; import android.widget.RadioGroup; import android.widget.RadioGroup.OnCheckedChangeListener; +import com.android.gallery3d.R; + public class WidgetTypeChooser extends Activity { private OnCheckedChangeListener mListener = new OnCheckedChangeListener() { diff --git a/src/com/android/gallery3d/gadget/WidgetUtils.java b/src/com/android/gallery3d/gadget/WidgetUtils.java index b194c7d8e..c20c186df 100644 --- a/src/com/android/gallery3d/gadget/WidgetUtils.java +++ b/src/com/android/gallery3d/gadget/WidgetUtils.java @@ -16,18 +16,18 @@ package com.android.gallery3d.gadget; -import com.android.gallery3d.R; -import com.android.gallery3d.data.MediaItem; -import com.android.gallery3d.util.ThreadPool; - import android.content.Context; import android.content.res.Resources; import android.graphics.Bitmap; +import android.graphics.Bitmap.Config; import android.graphics.Canvas; import android.graphics.Paint; -import android.graphics.Bitmap.Config; import android.util.Log; +import com.android.gallery3d.R; +import com.android.gallery3d.data.MediaItem; +import com.android.gallery3d.util.ThreadPool; + public class WidgetUtils { private static final String TAG = "WidgetUtils"; diff --git a/src/com/android/gallery3d/provider/GalleryProvider.java b/src/com/android/gallery3d/provider/GalleryProvider.java index 28fd6b843..79ec66be8 100644 --- a/src/com/android/gallery3d/provider/GalleryProvider.java +++ b/src/com/android/gallery3d/provider/GalleryProvider.java @@ -31,7 +31,6 @@ import android.util.Log; import com.android.gallery3d.app.GalleryApp; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.DataManager; -import com.android.gallery3d.data.DownloadCache; import com.android.gallery3d.data.MediaItem; import com.android.gallery3d.data.MediaObject; import com.android.gallery3d.data.MtpImage; diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java index f2093205f..9a6667598 100644 --- a/src/com/android/gallery3d/ui/ActionModeHandler.java +++ b/src/com/android/gallery3d/ui/ActionModeHandler.java @@ -28,8 +28,8 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.widget.Button; -import android.widget.ShareActionProvider; import android.widget.PopupMenu.OnMenuItemClickListener; +import android.widget.ShareActionProvider; import android.widget.ShareActionProvider.OnShareTargetSelectedListener; import com.android.gallery3d.R; diff --git a/src/com/android/gallery3d/ui/BitmapTexture.java b/src/com/android/gallery3d/ui/BitmapTexture.java index f5cb2bd38..607544907 100644 --- a/src/com/android/gallery3d/ui/BitmapTexture.java +++ b/src/com/android/gallery3d/ui/BitmapTexture.java @@ -16,10 +16,10 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.common.Utils; - import android.graphics.Bitmap; +import com.android.gallery3d.common.Utils; + // BitmapTexture is a texture whose content is specified by a fixed Bitmap. // // The texture does not own the Bitmap. The user should make sure the Bitmap diff --git a/src/com/android/gallery3d/ui/BitmapTileProvider.java b/src/com/android/gallery3d/ui/BitmapTileProvider.java index 4ad5412d6..ec2f97fed 100644 --- a/src/com/android/gallery3d/ui/BitmapTileProvider.java +++ b/src/com/android/gallery3d/ui/BitmapTileProvider.java @@ -16,11 +16,11 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.common.BitmapUtils; - import android.graphics.Bitmap; -import android.graphics.Canvas; import android.graphics.Bitmap.Config; +import android.graphics.Canvas; + +import com.android.gallery3d.common.BitmapUtils; import java.util.ArrayList; diff --git a/src/com/android/gallery3d/ui/CacheStorageUsageInfo.java b/src/com/android/gallery3d/ui/CacheStorageUsageInfo.java index 3c6e157ba..c65d77eff 100644 --- a/src/com/android/gallery3d/ui/CacheStorageUsageInfo.java +++ b/src/com/android/gallery3d/ui/CacheStorageUsageInfo.java @@ -16,12 +16,12 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.app.GalleryActivity; -import com.android.gallery3d.util.ThreadPool.JobContext; - import android.content.Context; import android.os.StatFs; +import com.android.gallery3d.app.GalleryActivity; +import com.android.gallery3d.util.ThreadPool.JobContext; + import java.io.File; public class CacheStorageUsageInfo { diff --git a/src/com/android/gallery3d/ui/CanvasTexture.java b/src/com/android/gallery3d/ui/CanvasTexture.java index 679a4bcdc..a2e9e48ad 100644 --- a/src/com/android/gallery3d/ui/CanvasTexture.java +++ b/src/com/android/gallery3d/ui/CanvasTexture.java @@ -17,8 +17,8 @@ package com.android.gallery3d.ui; import android.graphics.Bitmap; -import android.graphics.Canvas; import android.graphics.Bitmap.Config; +import android.graphics.Canvas; // CanvasTexture is a texture whose content is the drawing on a Canvas. // The subclasses should override onDraw() to draw on the bitmap. diff --git a/src/com/android/gallery3d/ui/CropView.java b/src/com/android/gallery3d/ui/CropView.java index 95080063a..78d5d373d 100644 --- a/src/com/android/gallery3d/ui/CropView.java +++ b/src/com/android/gallery3d/ui/CropView.java @@ -16,11 +16,6 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.R; -import com.android.gallery3d.anim.Animation; -import com.android.gallery3d.app.GalleryActivity; -import com.android.gallery3d.common.Utils; - import android.graphics.Bitmap; import android.graphics.Bitmap.Config; import android.graphics.Canvas; @@ -36,7 +31,13 @@ import android.view.MotionEvent; import android.view.animation.DecelerateInterpolator; import android.widget.Toast; +import com.android.gallery3d.R; +import com.android.gallery3d.anim.Animation; +import com.android.gallery3d.app.GalleryActivity; +import com.android.gallery3d.common.Utils; + import java.util.ArrayList; + import javax.microedition.khronos.opengles.GL11; /** diff --git a/src/com/android/gallery3d/ui/CustomMenu.java b/src/com/android/gallery3d/ui/CustomMenu.java index c3dd4530f..f1a4a467c 100644 --- a/src/com/android/gallery3d/ui/CustomMenu.java +++ b/src/com/android/gallery3d/ui/CustomMenu.java @@ -16,9 +16,6 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.R; - -import android.app.ActionBar; import android.content.Context; import android.view.Menu; import android.view.MenuItem; @@ -28,6 +25,8 @@ import android.widget.Button; import android.widget.PopupMenu; import android.widget.PopupMenu.OnMenuItemClickListener; +import com.android.gallery3d.R; + import java.util.ArrayList; public class CustomMenu implements OnMenuItemClickListener { diff --git a/src/com/android/gallery3d/ui/DetailsHelper.java b/src/com/android/gallery3d/ui/DetailsHelper.java index 8f1cd0c3f..245145f76 100644 --- a/src/com/android/gallery3d/ui/DetailsHelper.java +++ b/src/com/android/gallery3d/ui/DetailsHelper.java @@ -15,14 +15,14 @@ */ package com.android.gallery3d.ui; +import android.content.Context; +import android.view.View.MeasureSpec; + import com.android.gallery3d.R; import com.android.gallery3d.app.GalleryActivity; import com.android.gallery3d.data.MediaDetails; import com.android.gallery3d.ui.DetailsAddressResolver.AddressResolvingListener; -import android.content.Context; -import android.view.View.MeasureSpec; - public class DetailsHelper { private static DetailsAddressResolver sAddressResolver; private DetailsViewContainer mContainer; diff --git a/src/com/android/gallery3d/ui/EdgeEffect.java b/src/com/android/gallery3d/ui/EdgeEffect.java index c6c70ceac..362b8fea6 100644 --- a/src/com/android/gallery3d/ui/EdgeEffect.java +++ b/src/com/android/gallery3d/ui/EdgeEffect.java @@ -16,13 +16,14 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.R; - import android.content.Context; +import android.graphics.Canvas; import android.graphics.Rect; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; +import com.android.gallery3d.R; + // This is copied from android.widget.EdgeEffect with some small modifications: // (1) Copy the images (overscroll_{edge|glow}.png) to local resources. // (2) Use "GLCanvas" instead of "Canvas" for draw()'s parameter. diff --git a/src/com/android/gallery3d/ui/FadeInTexture.java b/src/com/android/gallery3d/ui/FadeInTexture.java index f351e34f3..c88fb47a2 100644 --- a/src/com/android/gallery3d/ui/FadeInTexture.java +++ b/src/com/android/gallery3d/ui/FadeInTexture.java @@ -18,8 +18,6 @@ package com.android.gallery3d.ui; import com.android.gallery3d.common.Utils; -import android.os.SystemClock; - // FadeInTexture is a texture which begins with a color, then gradually animates // into a given texture. public class FadeInTexture implements Texture { diff --git a/src/com/android/gallery3d/ui/FilmStripView.java b/src/com/android/gallery3d/ui/FilmStripView.java index ed288afee..58a01dae5 100644 --- a/src/com/android/gallery3d/ui/FilmStripView.java +++ b/src/com/android/gallery3d/ui/FilmStripView.java @@ -16,6 +16,10 @@ package com.android.gallery3d.ui; +import android.content.Context; +import android.view.MotionEvent; +import android.view.View.MeasureSpec; + import com.android.gallery3d.R; import com.android.gallery3d.anim.AlphaAnimation; import com.android.gallery3d.app.AlbumDataAdapter; @@ -24,10 +28,6 @@ import com.android.gallery3d.data.MediaItem; import com.android.gallery3d.data.MediaSet; import com.android.gallery3d.data.Path; -import android.content.Context; -import android.view.MotionEvent; -import android.view.View.MeasureSpec; - public class FilmStripView extends GLView implements UserInteractionListener { @SuppressWarnings("unused") private static final String TAG = "FilmStripView"; diff --git a/src/com/android/gallery3d/ui/FlingScroller.java b/src/com/android/gallery3d/ui/FlingScroller.java index fbe27ce00..1cddcdb76 100644 --- a/src/com/android/gallery3d/ui/FlingScroller.java +++ b/src/com/android/gallery3d/ui/FlingScroller.java @@ -16,7 +16,6 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.common.Utils; // This is a customized version of Scroller, with a interface similar to // android.widget.Scroller. It does fling only, not scroll. diff --git a/src/com/android/gallery3d/ui/GLCanvasImpl.java b/src/com/android/gallery3d/ui/GLCanvasImpl.java index 1c582853f..68f5636f7 100644 --- a/src/com/android/gallery3d/ui/GLCanvasImpl.java +++ b/src/com/android/gallery3d/ui/GLCanvasImpl.java @@ -16,18 +16,19 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.common.Utils; -import com.android.gallery3d.util.IntArray; - import android.graphics.Rect; import android.graphics.RectF; import android.opengl.GLU; import android.opengl.Matrix; +import com.android.gallery3d.common.Utils; +import com.android.gallery3d.util.IntArray; + import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; import java.util.ArrayList; + import javax.microedition.khronos.opengles.GL10; import javax.microedition.khronos.opengles.GL11; import javax.microedition.khronos.opengles.GL11Ext; diff --git a/src/com/android/gallery3d/ui/GLRootView.java b/src/com/android/gallery3d/ui/GLRootView.java index 62fc4f372..51853fffa 100644 --- a/src/com/android/gallery3d/ui/GLRootView.java +++ b/src/com/android/gallery3d/ui/GLRootView.java @@ -16,12 +16,6 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.anim.CanvasAnimation; -import com.android.gallery3d.common.Utils; -import com.android.gallery3d.util.GalleryUtils; -import com.android.gallery3d.util.Profile; - -import android.app.Activity; import android.content.Context; import android.graphics.PixelFormat; import android.graphics.Rect; @@ -29,12 +23,17 @@ import android.opengl.GLSurfaceView; import android.os.Process; import android.os.SystemClock; import android.util.AttributeSet; -import android.util.DisplayMetrics; import android.view.MotionEvent; +import com.android.gallery3d.anim.CanvasAnimation; +import com.android.gallery3d.common.Utils; +import com.android.gallery3d.util.GalleryUtils; +import com.android.gallery3d.util.Profile; + import java.util.ArrayList; import java.util.LinkedList; import java.util.concurrent.locks.ReentrantLock; + import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; import javax.microedition.khronos.opengles.GL11; diff --git a/src/com/android/gallery3d/ui/GLView.java b/src/com/android/gallery3d/ui/GLView.java index 26796b594..45471f910 100644 --- a/src/com/android/gallery3d/ui/GLView.java +++ b/src/com/android/gallery3d/ui/GLView.java @@ -16,13 +16,13 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.anim.CanvasAnimation; -import com.android.gallery3d.common.Utils; - import android.graphics.Rect; import android.os.SystemClock; import android.view.MotionEvent; +import com.android.gallery3d.anim.CanvasAnimation; +import com.android.gallery3d.common.Utils; + import java.util.ArrayList; // GLView is a UI component. It can render to a GLCanvas and accept touch diff --git a/src/com/android/gallery3d/ui/GridDrawer.java b/src/com/android/gallery3d/ui/GridDrawer.java index e8e072dc8..bf15eff00 100644 --- a/src/com/android/gallery3d/ui/GridDrawer.java +++ b/src/com/android/gallery3d/ui/GridDrawer.java @@ -16,13 +16,13 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.R; -import com.android.gallery3d.data.Path; - import android.content.Context; import android.graphics.Color; import android.text.Layout; +import com.android.gallery3d.R; +import com.android.gallery3d.data.Path; + public class GridDrawer extends IconDrawer { private Texture mImportLabel; private int mGridWidth; diff --git a/src/com/android/gallery3d/ui/HighlightDrawer.java b/src/com/android/gallery3d/ui/HighlightDrawer.java index f6a4695cb..6e73b0fda 100644 --- a/src/com/android/gallery3d/ui/HighlightDrawer.java +++ b/src/com/android/gallery3d/ui/HighlightDrawer.java @@ -15,11 +15,10 @@ */ package com.android.gallery3d.ui; -import com.android.gallery3d.R; -import com.android.gallery3d.data.Path; - import android.content.Context; +import com.android.gallery3d.data.Path; + public class HighlightDrawer extends IconDrawer { private SelectionManager mSelectionManager; private Path mHighlightItem; diff --git a/src/com/android/gallery3d/ui/IconDrawer.java b/src/com/android/gallery3d/ui/IconDrawer.java index 25440bca5..95a11731a 100644 --- a/src/com/android/gallery3d/ui/IconDrawer.java +++ b/src/com/android/gallery3d/ui/IconDrawer.java @@ -15,11 +15,11 @@ */ package com.android.gallery3d.ui; +import android.content.Context; + import com.android.gallery3d.R; import com.android.gallery3d.data.MediaObject; -import android.content.Context; - public abstract class IconDrawer extends SelectionDrawer { private static final String TAG = "IconDrawer"; private static final int LABEL_BACKGROUND_COLOR = 0x99000000; // 60% black diff --git a/src/com/android/gallery3d/ui/ImportCompleteListener.java b/src/com/android/gallery3d/ui/ImportCompleteListener.java index 5c52ea135..245088179 100644 --- a/src/com/android/gallery3d/ui/ImportCompleteListener.java +++ b/src/com/android/gallery3d/ui/ImportCompleteListener.java @@ -16,16 +16,14 @@ package com.android.gallery3d.ui; +import android.os.Bundle; +import android.widget.Toast; + import com.android.gallery3d.R; import com.android.gallery3d.app.AlbumPage; import com.android.gallery3d.app.GalleryActivity; -import com.android.gallery3d.data.Path; import com.android.gallery3d.util.MediaSetUtils; -import android.content.Context; -import android.os.Bundle; -import android.widget.Toast; - public class ImportCompleteListener implements MenuExecutor.ProgressListener { private GalleryActivity mActivity; diff --git a/src/com/android/gallery3d/ui/ManageCacheDrawer.java b/src/com/android/gallery3d/ui/ManageCacheDrawer.java index e75fe9aa7..7734fb331 100644 --- a/src/com/android/gallery3d/ui/ManageCacheDrawer.java +++ b/src/com/android/gallery3d/ui/ManageCacheDrawer.java @@ -16,12 +16,11 @@ package com.android.gallery3d.ui; +import android.content.Context; + import com.android.gallery3d.R; -import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.Path; -import android.content.Context; - public class ManageCacheDrawer extends IconDrawer { private final ResourceTexture mCheckedItem; private final ResourceTexture mUnCheckedItem; diff --git a/src/com/android/gallery3d/ui/NinePatchTexture.java b/src/com/android/gallery3d/ui/NinePatchTexture.java index ac71774f5..6a2ba0037 100644 --- a/src/com/android/gallery3d/ui/NinePatchTexture.java +++ b/src/com/android/gallery3d/ui/NinePatchTexture.java @@ -16,16 +16,17 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.common.Utils; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Rect; +import com.android.gallery3d.common.Utils; + import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; + import javax.microedition.khronos.opengles.GL11; // NinePatchTexture is a texture backed by a NinePatch resource. diff --git a/src/com/android/gallery3d/ui/Paper.java b/src/com/android/gallery3d/ui/Paper.java index 841908fbf..36d1f7515 100644 --- a/src/com/android/gallery3d/ui/Paper.java +++ b/src/com/android/gallery3d/ui/Paper.java @@ -16,17 +16,12 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.common.Utils; -import com.android.gallery3d.ui.PositionRepository.Position; -import com.android.gallery3d.util.GalleryUtils; - import android.opengl.Matrix; -import android.os.SystemClock; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; -import javax.microedition.khronos.opengles.GL11; -import javax.microedition.khronos.opengles.GL11ExtensionPack; +import com.android.gallery3d.common.Utils; +import com.android.gallery3d.ui.PositionRepository.Position; // This class does the overscroll effect. class Paper { diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java index 349b1a915..540846086 100644 --- a/src/com/android/gallery3d/ui/PhotoView.java +++ b/src/com/android/gallery3d/ui/PhotoView.java @@ -16,11 +16,6 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.R; -import com.android.gallery3d.app.GalleryActivity; -import com.android.gallery3d.data.Path; -import com.android.gallery3d.ui.PositionRepository.Position; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.Color; @@ -30,6 +25,11 @@ import android.view.GestureDetector; import android.view.MotionEvent; import android.view.ScaleGestureDetector; +import com.android.gallery3d.R; +import com.android.gallery3d.app.GalleryActivity; +import com.android.gallery3d.data.Path; +import com.android.gallery3d.ui.PositionRepository.Position; + public class PhotoView extends GLView { @SuppressWarnings("unused") private static final String TAG = "PhotoView"; diff --git a/src/com/android/gallery3d/ui/PositionController.java b/src/com/android/gallery3d/ui/PositionController.java index 9464ba6d9..1c9aba83c 100644 --- a/src/com/android/gallery3d/ui/PositionController.java +++ b/src/com/android/gallery3d/ui/PositionController.java @@ -16,15 +16,14 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.common.Utils; -import com.android.gallery3d.ui.PositionRepository.Position; -import com.android.gallery3d.util.GalleryUtils; - import android.content.Context; import android.graphics.RectF; -import android.os.SystemClock; import android.util.FloatMath; +import com.android.gallery3d.common.Utils; +import com.android.gallery3d.ui.PositionRepository.Position; +import com.android.gallery3d.util.GalleryUtils; + class PositionController { public static final int IMAGE_AT_LEFT_EDGE = 1; public static final int IMAGE_AT_RIGHT_EDGE = 2; diff --git a/src/com/android/gallery3d/ui/PositionRepository.java b/src/com/android/gallery3d/ui/PositionRepository.java index 0ea087508..1827c3bfb 100644 --- a/src/com/android/gallery3d/ui/PositionRepository.java +++ b/src/com/android/gallery3d/ui/PositionRepository.java @@ -16,13 +16,13 @@ package com.android.gallery3d.ui; +import android.util.SparseArray; + import com.android.gallery3d.app.GalleryActivity; import com.android.gallery3d.common.Utils; import java.util.WeakHashMap; -import android.util.SparseArray; - public class PositionRepository { private static final WeakHashMap sMap = new WeakHashMap(); diff --git a/src/com/android/gallery3d/ui/ProgressSpinner.java b/src/com/android/gallery3d/ui/ProgressSpinner.java index d3cc8e627..4f9381c76 100644 --- a/src/com/android/gallery3d/ui/ProgressSpinner.java +++ b/src/com/android/gallery3d/ui/ProgressSpinner.java @@ -16,10 +16,10 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.R; - import android.content.Context; +import com.android.gallery3d.R; + public class ProgressSpinner { private static float ROTATE_SPEED_OUTER = 1080f / 3500f; private static float ROTATE_SPEED_INNER = -720f / 3500f; diff --git a/src/com/android/gallery3d/ui/ResourceTexture.java b/src/com/android/gallery3d/ui/ResourceTexture.java index 08fb89187..1fa9d7014 100644 --- a/src/com/android/gallery3d/ui/ResourceTexture.java +++ b/src/com/android/gallery3d/ui/ResourceTexture.java @@ -16,12 +16,12 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.common.Utils; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import com.android.gallery3d.common.Utils; + // ResourceTexture is a texture whose Bitmap is decoded from a resource. // By default ResourceTexture is not opaque. public class ResourceTexture extends UploadedTexture { diff --git a/src/com/android/gallery3d/ui/ScrollBarView.java b/src/com/android/gallery3d/ui/ScrollBarView.java index c4266b6cf..82d4800cc 100644 --- a/src/com/android/gallery3d/ui/ScrollBarView.java +++ b/src/com/android/gallery3d/ui/ScrollBarView.java @@ -16,8 +16,6 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.R; - import android.content.Context; import android.graphics.Rect; import android.util.TypedValue; diff --git a/src/com/android/gallery3d/ui/ScrollerHelper.java b/src/com/android/gallery3d/ui/ScrollerHelper.java index 0fa85ee41..1ff633a87 100644 --- a/src/com/android/gallery3d/ui/ScrollerHelper.java +++ b/src/com/android/gallery3d/ui/ScrollerHelper.java @@ -16,12 +16,12 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.common.Utils; - import android.content.Context; import android.view.ViewConfiguration; import android.widget.OverScroller; +import com.android.gallery3d.common.Utils; + public class ScrollerHelper { private OverScroller mScroller; private int mOverflingDistance; diff --git a/src/com/android/gallery3d/ui/SelectionDrawer.java b/src/com/android/gallery3d/ui/SelectionDrawer.java index 43b368f6f..e69a90282 100644 --- a/src/com/android/gallery3d/ui/SelectionDrawer.java +++ b/src/com/android/gallery3d/ui/SelectionDrawer.java @@ -16,11 +16,10 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.common.Utils; -import com.android.gallery3d.data.Path; - import android.graphics.Rect; +import com.android.gallery3d.data.Path; + /** * Drawer class responsible for drawing selectable frame. */ diff --git a/src/com/android/gallery3d/ui/SlideshowView.java b/src/com/android/gallery3d/ui/SlideshowView.java index 95f4a8d23..a057bb748 100644 --- a/src/com/android/gallery3d/ui/SlideshowView.java +++ b/src/com/android/gallery3d/ui/SlideshowView.java @@ -16,13 +16,14 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.anim.CanvasAnimation; -import com.android.gallery3d.anim.FloatAnimation; - import android.graphics.Bitmap; import android.graphics.PointF; +import com.android.gallery3d.anim.CanvasAnimation; +import com.android.gallery3d.anim.FloatAnimation; + import java.util.Random; + import javax.microedition.khronos.opengles.GL11; public class SlideshowView extends GLView { diff --git a/src/com/android/gallery3d/ui/StringTexture.java b/src/com/android/gallery3d/ui/StringTexture.java index 935cd729e..2db2de4a2 100644 --- a/src/com/android/gallery3d/ui/StringTexture.java +++ b/src/com/android/gallery3d/ui/StringTexture.java @@ -21,9 +21,9 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint.FontMetricsInt; import android.graphics.Typeface; -import android.util.FloatMath; import android.text.TextPaint; import android.text.TextUtils; +import android.util.FloatMath; // StringTexture is a texture shows the content of a specified String. // diff --git a/src/com/android/gallery3d/ui/StripDrawer.java b/src/com/android/gallery3d/ui/StripDrawer.java index 5941392c5..a4bb37825 100644 --- a/src/com/android/gallery3d/ui/StripDrawer.java +++ b/src/com/android/gallery3d/ui/StripDrawer.java @@ -16,12 +16,12 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.R; -import com.android.gallery3d.data.Path; - import android.content.Context; import android.graphics.Rect; +import com.android.gallery3d.R; +import com.android.gallery3d.data.Path; + public class StripDrawer extends SelectionDrawer { private NinePatchTexture mFramePressed; private NinePatchTexture mFocusBox; diff --git a/src/com/android/gallery3d/ui/SynchronizedHandler.java b/src/com/android/gallery3d/ui/SynchronizedHandler.java index bd494a331..ba1035747 100644 --- a/src/com/android/gallery3d/ui/SynchronizedHandler.java +++ b/src/com/android/gallery3d/ui/SynchronizedHandler.java @@ -16,11 +16,11 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.common.Utils; - import android.os.Handler; import android.os.Message; +import com.android.gallery3d.common.Utils; + public class SynchronizedHandler extends Handler { private final GLRoot mRoot; diff --git a/src/com/android/gallery3d/ui/TileImageView.java b/src/com/android/gallery3d/ui/TileImageView.java index 1f2108d43..7ad554684 100644 --- a/src/com/android/gallery3d/ui/TileImageView.java +++ b/src/com/android/gallery3d/ui/TileImageView.java @@ -30,8 +30,6 @@ import com.android.gallery3d.util.ThreadPool; import com.android.gallery3d.util.ThreadPool.CancelListener; import com.android.gallery3d.util.ThreadPool.JobContext; -import java.util.Iterator; -import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; public class TileImageView extends GLView { diff --git a/src/com/android/gallery3d/ui/UploadedTexture.java b/src/com/android/gallery3d/ui/UploadedTexture.java index b2b8cd514..3469d7938 100644 --- a/src/com/android/gallery3d/ui/UploadedTexture.java +++ b/src/com/android/gallery3d/ui/UploadedTexture.java @@ -16,13 +16,14 @@ package com.android.gallery3d.ui; -import com.android.gallery3d.common.Utils; - import android.graphics.Bitmap; import android.graphics.Bitmap.Config; import android.opengl.GLUtils; +import com.android.gallery3d.common.Utils; + import java.util.HashMap; + import javax.microedition.khronos.opengles.GL11; import javax.microedition.khronos.opengles.GL11Ext; diff --git a/src/com/android/gallery3d/util/CacheManager.java b/src/com/android/gallery3d/util/CacheManager.java index fcc444e98..ba466f79b 100644 --- a/src/com/android/gallery3d/util/CacheManager.java +++ b/src/com/android/gallery3d/util/CacheManager.java @@ -16,12 +16,12 @@ package com.android.gallery3d.util; -import com.android.gallery3d.common.BlobCache; - import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; +import com.android.gallery3d.common.BlobCache; + import java.io.File; import java.io.IOException; import java.util.HashMap; diff --git a/src/com/android/gallery3d/util/GalleryUtils.java b/src/com/android/gallery3d/util/GalleryUtils.java index 9a7e09316..fa9c97c75 100644 --- a/src/com/android/gallery3d/util/GalleryUtils.java +++ b/src/com/android/gallery3d/util/GalleryUtils.java @@ -16,13 +16,6 @@ package com.android.gallery3d.util; -import com.android.gallery3d.R; -import com.android.gallery3d.app.PackagesMonitor; -import com.android.gallery3d.data.DataManager; -import com.android.gallery3d.data.MediaItem; -import com.android.gallery3d.util.ThreadPool.CancelListener; -import com.android.gallery3d.util.ThreadPool.JobContext; - import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.ComponentName; @@ -41,6 +34,13 @@ import android.util.DisplayMetrics; import android.util.Log; import android.view.WindowManager; +import com.android.gallery3d.R; +import com.android.gallery3d.app.PackagesMonitor; +import com.android.gallery3d.data.DataManager; +import com.android.gallery3d.data.MediaItem; +import com.android.gallery3d.util.ThreadPool.CancelListener; +import com.android.gallery3d.util.ThreadPool.JobContext; + import java.util.Arrays; import java.util.List; import java.util.Locale; diff --git a/src/com/android/gallery3d/util/IdentityCache.java b/src/com/android/gallery3d/util/IdentityCache.java index 59a22910b..3edc424a3 100644 --- a/src/com/android/gallery3d/util/IdentityCache.java +++ b/src/com/android/gallery3d/util/IdentityCache.java @@ -18,8 +18,8 @@ package com.android.gallery3d.util; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; -import java.util.HashMap; import java.util.ArrayList; +import java.util.HashMap; import java.util.Set; public class IdentityCache { diff --git a/src/com/android/gallery3d/util/MediaSetUtils.java b/src/com/android/gallery3d/util/MediaSetUtils.java index 8a556aa79..8e60f5955 100644 --- a/src/com/android/gallery3d/util/MediaSetUtils.java +++ b/src/com/android/gallery3d/util/MediaSetUtils.java @@ -16,12 +16,12 @@ package com.android.gallery3d.util; +import android.os.Environment; + import com.android.gallery3d.data.MediaSet; import com.android.gallery3d.data.MtpContext; import com.android.gallery3d.data.Path; -import android.os.Environment; - import java.util.Comparator; public class MediaSetUtils { diff --git a/src/com/android/gallery3d/util/Profile.java b/src/com/android/gallery3d/util/Profile.java index 96a815397..6b6e5c3c3 100644 --- a/src/com/android/gallery3d/util/Profile.java +++ b/src/com/android/gallery3d/util/Profile.java @@ -16,12 +16,9 @@ package com.android.gallery3d.util; -import com.android.gallery3d.common.Utils; - import android.os.Handler; import android.os.HandlerThread; import android.os.Process; -import android.util.Log; import java.util.ArrayList; import java.util.Random; diff --git a/src/com/android/gallery3d/util/ProfileData.java b/src/com/android/gallery3d/util/ProfileData.java index 8de4c76ca..02eb37a90 100644 --- a/src/com/android/gallery3d/util/ProfileData.java +++ b/src/com/android/gallery3d/util/ProfileData.java @@ -16,10 +16,10 @@ package com.android.gallery3d.util; -import com.android.gallery3d.common.Utils; - import android.util.Log; +import com.android.gallery3d.common.Utils; + import java.io.DataOutputStream; import java.io.FileOutputStream; import java.io.IOException; diff --git a/src/com/android/gallery3d/util/ReverseGeocoder.java b/src/com/android/gallery3d/util/ReverseGeocoder.java index d253b4b96..3df4c4933 100644 --- a/src/com/android/gallery3d/util/ReverseGeocoder.java +++ b/src/com/android/gallery3d/util/ReverseGeocoder.java @@ -16,8 +16,6 @@ package com.android.gallery3d.util; -import com.android.gallery3d.common.BlobCache; - import android.content.Context; import android.location.Address; import android.location.Geocoder; @@ -26,6 +24,8 @@ import android.location.LocationManager; import android.net.ConnectivityManager; import android.net.NetworkInfo; +import com.android.gallery3d.common.BlobCache; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; -- cgit v1.2.3