Remove some more unused code.

Remove unused memebers and parameters

Change-Id: I35ccef892bd711c078a45ddbd92b651f950ff864

9 files changed, 7 insertions, 19 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index c4c946a..753d923 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -202,8 +202,9 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
     public long mJpegPictureCallbackTimeLag;
     public long mRawPictureAndJpegPictureCallbackTime;
 
-    // Add the media server tag
+    // Add for test
     public static boolean mMediaServerDied = false;
+
     // Focus mode. Options are pref_camera_focusmode_entryvalues.
     private String mFocusMode;
 
@@ -662,7 +663,7 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
         }
     }
 
-    private final class ErrorCallback
+    private static final class ErrorCallback
         implements android.hardware.Camera.ErrorCallback {
         public void onError(int error, android.hardware.Camera camera) {
             if (error == android.hardware.Camera.CAMERA_ERROR_SERVER_DIED) {
diff --git a/src/com/android/camera/ImageManager.java b/src/com/android/camera/ImageManager.java
index 25c8c29..0a6fd2f 100644
--- a/src/com/android/camera/ImageManager.java
+++ b/src/com/android/camera/ImageManager.java
@@ -339,8 +339,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));
@@ -349,9 +348,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 dfd0932..5a9069a 100644
--- a/src/com/android/camera/ImageViewTouchBase.java
+++ b/src/com/android/camera/ImageViewTouchBase.java
@@ -114,8 +114,6 @@ abstract class ImageViewTouchBase extends ImageView {
         return super.onKeyUp(keyCode, event);
     }
 
-    protected Handler mHandler = new Handler();
-
     @Override
     public void setImageBitmap(Bitmap bitmap) {
         setImageBitmap(bitmap, 0);
diff --git a/src/com/android/camera/OnScreenHint.java b/src/com/android/camera/OnScreenHint.java
index 03056fa..54a2f64 100644
--- a/src/com/android/camera/OnScreenHint.java
+++ b/src/com/android/camera/OnScreenHint.java
@@ -41,7 +41,6 @@ public class OnScreenHint {
     static final String TAG = "OnScreenHint";
     static final boolean LOCAL_LOGV = false;
 
-    final Context mContext;
     int mGravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
     int mX, mY;
     float mHorizontalMargin;
@@ -63,7 +62,6 @@ public class OnScreenHint {
      *                 {@link android.app.Activity} object.
      */
     public OnScreenHint(Context context) {
-        mContext = context;
         mWM = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
         mY = context.getResources().getDimensionPixelSize(
                 R.dimen.hint_y_offset);
diff --git a/src/com/android/camera/OnScreenSettings.java b/src/com/android/camera/OnScreenSettings.java
index 1547d03..55294b1 100644
--- a/src/com/android/camera/OnScreenSettings.java
+++ b/src/com/android/camera/OnScreenSettings.java
@@ -70,7 +70,6 @@ public class OnScreenSettings {
     private final View mOwnerView;
     private ListView mMainMenu;
     private ListView mSubMenu;
-    private View mMainPanel;
     private boolean mIsVisible = false;
     private OnVisibilityChangedListener mVisibilityListener;
     private MainMenuAdapter mMainAdapter;
@@ -216,7 +215,6 @@ public class OnScreenSettings {
 
         mInflater.inflate(R.layout.on_screen_menu, container);
 
-        mMainPanel = container.findViewById(R.id.main_panel);
         mMainMenu = (ListView) container.findViewById(R.id.menu_view);
         mSubMenu = (ListView) container.findViewById(R.id.sub_menu);
 
diff --git a/src/com/android/camera/gallery/BaseImage.java b/src/com/android/camera/gallery/BaseImage.java
index 42d0f66..fd41ab4 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;
@@ -66,7 +65,6 @@ public abstract class BaseImage implements IImage {
         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..f745977 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
diff --git a/src/com/android/camera/gallery/ImageList.java b/src/com/android/camera/gallery/ImageList.java
index 064a192..bc9d7ca 100644
--- a/src/com/android/camera/gallery/ImageList.java
+++ b/src/com/android/camera/gallery/ImageList.java
@@ -36,10 +36,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 =