Remove some unused code.

Remove unused field / parameters.

Change-Id: I9642d8ca50f2eaada074c5c5193610c1108142d8

10 files changed, 14 insertions, 27 deletions

diff --git a/src/com/android/camera/ImageManager.java b/src/com/android/camera/ImageManager.java
index 04b7bd2..ab7fe9c 100644
--- a/src/com/android/camera/ImageManager.java
+++ b/src/com/android/camera/ImageManager.java
@@ -305,8 +305,7 @@ public class ImageManager {
 
         if (haveSdCard && location != DataLocation.INTERNAL) {
             if ((inclusion & INCLUDE_IMAGES) != 0) {
-                l.add(new ImageList(
-                        cr, STORAGE_URI, THUMB_URI, sort, bucketId));
+                l.add(new ImageList(cr, STORAGE_URI, sort, bucketId));
             }
             if ((inclusion & INCLUDE_VIDEOS) != 0) {
                 l.add(new VideoList(cr, VIDEO_STORAGE_URI, sort, bucketId));
@@ -315,9 +314,7 @@ public class ImageManager {
         if (location == DataLocation.INTERNAL || location == DataLocation.ALL) {
             if ((inclusion & INCLUDE_IMAGES) != 0) {
                 l.add(new ImageList(cr,
-                        Images.Media.INTERNAL_CONTENT_URI,
-                        Images.Thumbnails.INTERNAL_CONTENT_URI,
-                        sort, bucketId));
+                        Images.Media.INTERNAL_CONTENT_URI, sort, bucketId));
             }
             if ((inclusion & INCLUDE_DRM_IMAGES) != 0) {
                 l.add(new DrmImageList(
diff --git a/src/com/android/camera/ImageViewTouchBase.java b/src/com/android/camera/ImageViewTouchBase.java
index ef2edeb..84fb173 100644
--- a/src/com/android/camera/ImageViewTouchBase.java
+++ b/src/com/android/camera/ImageViewTouchBase.java
@@ -116,9 +116,6 @@ abstract class ImageViewTouchBase extends ImageView {
 
     protected Handler mHandler = new Handler();
 
-    protected int mLastXTouchPos;
-    protected int mLastYTouchPos;
-
     @Override
     public void setImageBitmap(Bitmap bitmap) {
         setImageBitmap(bitmap, 0);
diff --git a/src/com/android/camera/ViewImage.java b/src/com/android/camera/ViewImage.java
index 0443d02..9288c53 100644
--- a/src/com/android/camera/ViewImage.java
+++ b/src/com/android/camera/ViewImage.java
@@ -741,9 +741,6 @@ public class ViewImage extends NoSearchActivity implements View.OnClickListener
             }
 
             ImageViewTouchBase dst = mImageView;
-            dst.mLastXTouchPos = -1;
-            dst.mLastYTouchPos = -1;
-
             for (ImageViewTouchBase ivt : mSlideShowImageViews) {
                 ivt.clear();
             }
diff --git a/src/com/android/camera/gallery/BaseImage.java b/src/com/android/camera/gallery/BaseImage.java
index 42d0f66..1349deb 100644
--- a/src/com/android/camera/gallery/BaseImage.java
+++ b/src/com/android/camera/gallery/BaseImage.java
@@ -45,7 +45,6 @@ public abstract class BaseImage implements IImage {
     protected Uri mUri;
     protected long mId;
     protected String mDataPath;
-    protected long mMiniThumbMagic;
     protected final int mIndex;
     protected String mMimeType;
     private final long mDateTaken;
@@ -58,15 +57,14 @@ public abstract class BaseImage implements IImage {
     private int mHeight = UNKNOWN_LENGTH;
 
     protected BaseImage(BaseImageList container, ContentResolver cr,
-            long id, int index, Uri uri, String dataPath, long miniThumbMagic,
-            String mimeType, long dateTaken, String title, String displayName) {
+            long id, int index, Uri uri, String dataPath, String mimeType,
+            long dateTaken, String title, String displayName) {
         mContainer = container;
         mContentResolver = cr;
         mId = id;
         mIndex = index;
         mUri = uri;
         mDataPath = dataPath;
-        mMiniThumbMagic = miniThumbMagic;
         mMimeType = mimeType;
         mDateTaken = dateTaken;
         mTitle = title;
diff --git a/src/com/android/camera/gallery/BaseImageList.java b/src/com/android/camera/gallery/BaseImageList.java
index ce85753..cc42db7 100644
--- a/src/com/android/camera/gallery/BaseImageList.java
+++ b/src/com/android/camera/gallery/BaseImageList.java
@@ -43,7 +43,6 @@ public abstract class BaseImageList implements IImageList {
     protected Uri mBaseUri;
     protected Cursor mCursor;
     protected String mBucketId;
-    protected Uri mThumbUri;
     protected boolean mCursorDeactivated = false;
 
     public BaseImageList(ContentResolver resolver, Uri uri, int sort,
diff --git a/src/com/android/camera/gallery/DrmImageList.java b/src/com/android/camera/gallery/DrmImageList.java
index 3acd43c..cd1586d 100644
--- a/src/com/android/camera/gallery/DrmImageList.java
+++ b/src/com/android/camera/gallery/DrmImageList.java
@@ -40,7 +40,7 @@ public class DrmImageList extends ImageList implements IImageList {
 
     public DrmImageList(ContentResolver resolver, Uri imageUri, int sort,
             String bucketId) {
-        super(resolver, imageUri, null, sort, bucketId);
+        super(resolver, imageUri, sort, bucketId);
     }
 
     @Override
@@ -61,7 +61,7 @@ public class DrmImageList extends ImageList implements IImageList {
                 long id, int index, Uri uri, String dataPath,
                 long miniThumbMagic, String mimeType, long dateTaken,
                 String title, String displayName, int rotation) {
-            super(container, cr, id, index, uri, dataPath, miniThumbMagic,
+            super(container, cr, id, index, uri, dataPath,
                     mimeType, dateTaken, title, displayName, rotation);
         }
 
diff --git a/src/com/android/camera/gallery/Image.java b/src/com/android/camera/gallery/Image.java
index 78ec382..69575f1 100644
--- a/src/com/android/camera/gallery/Image.java
+++ b/src/com/android/camera/gallery/Image.java
@@ -43,10 +43,10 @@ public class Image extends BaseImage implements IImage {
     private int mRotation;
 
     public Image(BaseImageList container, ContentResolver cr,
-            long id, int index, Uri uri, String dataPath, long miniThumbMagic,
+            long id, int index, Uri uri, String dataPath,
             String mimeType, long dateTaken, String title, String displayName,
             int rotation) {
-        super(container, cr, id, index, uri, dataPath, miniThumbMagic,
+        super(container, cr, id, index, uri, dataPath,
                 mimeType, dateTaken, title, displayName);
         mRotation = rotation;
     }
diff --git a/src/com/android/camera/gallery/ImageList.java b/src/com/android/camera/gallery/ImageList.java
index 9a47e55..96136d7 100644
--- a/src/com/android/camera/gallery/ImageList.java
+++ b/src/com/android/camera/gallery/ImageList.java
@@ -58,10 +58,9 @@ public class ImageList extends BaseImageList implements IImageList {
     /**
      * ImageList constructor.
      */
-    public ImageList(ContentResolver resolver, Uri imageUri, Uri thumbUri,
+    public ImageList(ContentResolver resolver, Uri imageUri,
             int sort, String bucketId) {
         super(resolver, imageUri, sort, bucketId);
-        mThumbUri = thumbUri;
     }
 
     private static final String WHERE_CLAUSE =
@@ -134,7 +133,7 @@ public class ImageList extends BaseImageList implements IImageList {
         }
         String displayName = title;
         return new Image(this, mContentResolver, id, cursor.getPosition(),
-                contentUri(id), dataPath, miniThumbMagic, mimeType, dateTaken,
-                title, displayName, orientation);
+                contentUri(id), dataPath, mimeType, dateTaken, title,
+                displayName, orientation);
     }
 }
diff --git a/src/com/android/camera/gallery/VideoList.java b/src/com/android/camera/gallery/VideoList.java
index c22a206..4417c14 100644
--- a/src/com/android/camera/gallery/VideoList.java
+++ b/src/com/android/camera/gallery/VideoList.java
@@ -71,7 +71,7 @@ public class VideoList extends BaseImageList {
 
         return new VideoObject(this, mContentResolver,
                 id, cursor.getPosition(), contentUri(id), dataPath,
-                miniThumbMagic, mimeType, dateTaken, title, displayName);
+                mimeType, dateTaken, title, displayName);
     }
 
     public VideoList(ContentResolver resolver, Uri uri, int sort,
diff --git a/src/com/android/camera/gallery/VideoObject.java b/src/com/android/camera/gallery/VideoObject.java
index d6e5060..3ef06b1 100644
--- a/src/com/android/camera/gallery/VideoObject.java
+++ b/src/com/android/camera/gallery/VideoObject.java
@@ -43,9 +43,9 @@ public class VideoObject extends BaseImage implements IImage {
      * @param cr        the content resolver
      */
     protected VideoObject(BaseImageList container, ContentResolver cr,
-            long id, int index, Uri uri, String dataPath, long miniThumbMagic,
+            long id, int index, Uri uri, String dataPath,
             String mimeType, long dateTaken, String title, String displayName) {
-        super(container, cr, id, index, uri, dataPath, miniThumbMagic,
+        super(container, cr, id, index, uri, dataPath,
                 mimeType, dateTaken, title, displayName);
     }