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/ui | |
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/ui')
36 files changed, 90 insertions, 104 deletions
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<GalleryActivity, PositionRepository> sMap = new WeakHashMap<GalleryActivity, PositionRepository>(); 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; |