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/app | |
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/app')
19 files changed, 66 insertions, 78 deletions
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. |