Merge change 21254 into eclair

* changes:
  Fix the warnings shown in Eclipse. That is, removing unused field, replace deprecated methods, and removing unused imports.

12 files changed, 24 insertions, 29 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index e14c3d9..cf7587d 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -58,7 +58,6 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.widget.ImageView;
-import android.widget.Toast;
 import android.widget.ZoomButtonsController;
 
 import com.android.camera.gallery.Cancelable;
@@ -278,7 +277,7 @@ public class Camera extends Activity implements View.OnClickListener,
                     (ImageView) findViewById(R.id.review_thumbnail);
             mLastPictureButton.setOnClickListener(this);
             mThumbController = new ThumbnailController(
-                    mLastPictureButton, mContentResolver);
+                    getResources(), mLastPictureButton, mContentResolver);
             mThumbController.loadData(ImageManager.getLastImageThumbPath());
             // Update last image thumbnail.
             updateThumbnailButton();
@@ -928,10 +927,6 @@ public class Camera extends Activity implements View.OnClickListener,
         }
     }
 
-    private void updateStorageHint() {
-        updateStorageHint(MenuHelper.calculatePicturesRemaining());
-    }
-
     private OnScreenHint mStorageHint;
 
     private void updateStorageHint(int remaining) {
diff --git a/src/com/android/camera/GridViewSpecial.java b/src/com/android/camera/GridViewSpecial.java
index fef9696..21dc3fe 100644
--- a/src/com/android/camera/GridViewSpecial.java
+++ b/src/com/android/camera/GridViewSpecial.java
@@ -18,9 +18,6 @@ package com.android.camera;
 
 import static com.android.camera.Util.Assert;
 
-import com.android.camera.gallery.IImage;
-import com.android.camera.gallery.IImageList;
-
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -32,7 +29,6 @@ import android.media.AudioManager;
 import android.os.Handler;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.GestureDetector;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -41,6 +37,9 @@ import android.view.ViewConfiguration;
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.widget.Scroller;
 
+import com.android.camera.gallery.IImage;
+import com.android.camera.gallery.IImageList;
+
 import java.util.HashMap;
 
 class GridViewSpecial extends View {
diff --git a/src/com/android/camera/ImageViewTouchBase.java b/src/com/android/camera/ImageViewTouchBase.java
index 5841854..d858420 100644
--- a/src/com/android/camera/ImageViewTouchBase.java
+++ b/src/com/android/camera/ImageViewTouchBase.java
@@ -23,7 +23,6 @@ import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.widget.ImageView;
 
diff --git a/src/com/android/camera/MenuHelper.java b/src/com/android/camera/MenuHelper.java
index 6c0c58d..ed208a6 100644
--- a/src/com/android/camera/MenuHelper.java
+++ b/src/com/android/camera/MenuHelper.java
@@ -16,8 +16,6 @@
 
 package com.android.camera;
 
-import com.android.camera.gallery.IImage;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
@@ -25,7 +23,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.DialogInterface.OnClickListener;
-import android.location.Address;
 import android.location.Geocoder;
 import android.media.ExifInterface;
 import android.media.MediaMetadataRetriever;
@@ -47,8 +44,9 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.camera.gallery.IImage;
+
 import java.io.Closeable;
-import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/src/com/android/camera/RotateBitmap.java b/src/com/android/camera/RotateBitmap.java
index 1f72b17..67ca3c3 100644
--- a/src/com/android/camera/RotateBitmap.java
+++ b/src/com/android/camera/RotateBitmap.java
@@ -18,7 +18,6 @@ package com.android.camera;
 
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
-import android.util.Log;
 
 public class RotateBitmap {
     public static final String TAG = "RotateBitmap";
diff --git a/src/com/android/camera/Switcher.java b/src/com/android/camera/Switcher.java
index 3c7fc44..938f6a1 100644
--- a/src/com/android/camera/Switcher.java
+++ b/src/com/android/camera/Switcher.java
@@ -20,13 +20,14 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
 
 public class Switcher extends ImageView implements View.OnTouchListener {
+
+    @SuppressWarnings("unused")
     private static final String TAG = "Switcher";
 
     public interface OnSwitchListener {
diff --git a/src/com/android/camera/ThumbnailController.java b/src/com/android/camera/ThumbnailController.java
index d3dc2af..c371222 100644
--- a/src/com/android/camera/ThumbnailController.java
+++ b/src/com/android/camera/ThumbnailController.java
@@ -18,6 +18,7 @@ package com.android.camera;
 
 
 import android.content.ContentResolver;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
@@ -66,10 +67,12 @@ public class ThumbnailController {
     private boolean mShouldAnimateThumb;
     private final Animation mShowButtonAnimation = new AlphaAnimation(0F, 1F);
     private boolean mShouldAnimateButton;
+    private final Resources mResources;
 
     // The "frame" is a drawable we want to put on top of the thumbnail.
-    public ThumbnailController(
+    public ThumbnailController(Resources resources,
             ImageView button, ContentResolver contentResolver) {
+        mResources = resources;
         mButton = button;
         mContentResolver = contentResolver;
         mShowButtonAnimation.setDuration(500);
@@ -185,12 +188,12 @@ public class ThumbnailController {
         Drawable drawable;
         if (mThumbs == null) {
             mThumbs = new Drawable[2];
-            mThumbs[1] = new BitmapDrawable(mThumb);
+            mThumbs[1] = new BitmapDrawable(mResources, mThumb);
             drawable = mThumbs[1];
             mShouldAnimateThumb = false;
         } else {
             mThumbs[0] = mThumbs[1];
-            mThumbs[1] = new BitmapDrawable(mThumb);
+            mThumbs[1] = new BitmapDrawable(mResources, mThumb);
             mThumbTransition = new TransitionDrawable(mThumbs);
             drawable = mThumbTransition;
             mShouldAnimateThumb = true;
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 33fff49..eff5507 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -253,8 +253,8 @@ public class VideoCamera extends Activity implements View.OnClickListener,
                     R.layout.camera_control, rootView);
             mLastPictureButton =
                     (ImageView) controlBar.findViewById(R.id.review_thumbnail);
-            mThumbController = new ThumbnailController(mLastPictureButton,
-                    mContentResolver);
+            mThumbController = new ThumbnailController(
+                    getResources(), mLastPictureButton, mContentResolver);
             mLastPictureButton.setOnClickListener(this);
             mThumbController.loadData(ImageManager.getLastVideoThumbPath());
             mSwitcher = ((Switcher) findViewById(R.id.camera_switch));
@@ -1357,6 +1357,8 @@ class DefaultHashMap<K, V> extends HashMap<K, V> {
 // values for various parameters for MediaRecorder.
 //
 class MediaRecorderProfile {
+
+    @SuppressWarnings("unused")
     private static final String TAG = "MediaRecorderProfile";
     public final boolean mHiQuality;
     public final int mOutputFormat;
diff --git a/src/com/android/camera/Wallpaper.java b/src/com/android/camera/Wallpaper.java
index 0b053ce..92b104a 100644
--- a/src/com/android/camera/Wallpaper.java
+++ b/src/com/android/camera/Wallpaper.java
@@ -18,6 +18,7 @@ package com.android.camera;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.app.WallpaperManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -92,7 +93,7 @@ public class Wallpaper extends Activity {
         @Override
         public void run() {
             try {
-                mContext.setWallpaper(mBitmap);
+                WallpaperManager.getInstance(mContext).setBitmap(mBitmap);
             } catch (IOException e) {
                 Log.e(LOG_TAG, "Failed to set wallpaper.", e);
             } finally {
diff --git a/src/com/android/camera/gallery/BaseCancelable.java b/src/com/android/camera/gallery/BaseCancelable.java
index 4fde291..d5566a8 100644
--- a/src/com/android/camera/gallery/BaseCancelable.java
+++ b/src/com/android/camera/gallery/BaseCancelable.java
@@ -48,7 +48,6 @@ public abstract class BaseCancelable<T> implements Cancelable<T> {
     private Throwable mError;
     private T mResult;
     private Cancelable<?> mCurrentTask;
-    private Thread mThread;
 
     protected abstract T execute() throws Exception;
 
@@ -86,7 +85,6 @@ public abstract class BaseCancelable<T> implements Cancelable<T> {
                 await();
                 return handleTerminalStates();
             }
-            mThread = Thread.currentThread();
             mState = STATE_EXECUTING;
         }
         try {
diff --git a/src/com/android/camera/gallery/LruCache.java b/src/com/android/camera/gallery/LruCache.java
index 571fdd3..9a7eb96 100644
--- a/src/com/android/camera/gallery/LruCache.java
+++ b/src/com/android/camera/gallery/LruCache.java
@@ -19,7 +19,6 @@ package com.android.camera.gallery;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -42,12 +41,13 @@ public class LruCache<K, V> {
     private static class Entry<K, V> extends WeakReference<V> {
         K mKey;
 
-        public Entry(K key, V value, ReferenceQueue queue) {
+        public Entry(K key, V value, ReferenceQueue<V> queue) {
             super(value, queue);
             mKey = key;
         }
     }
 
+    @SuppressWarnings("unchecked")
     private void cleanUpWeakMap() {
         Entry<K, V> entry = (Entry<K, V>) mQueue.poll();
         while (entry != null) {
diff --git a/src/com/android/camera/gallery/VideoObject.java b/src/com/android/camera/gallery/VideoObject.java
index 61dbd8e..39a03e2 100644
--- a/src/com/android/camera/gallery/VideoObject.java
+++ b/src/com/android/camera/gallery/VideoObject.java
@@ -16,12 +16,12 @@
 
 package com.android.camera.gallery;
 
-import com.android.camera.Util;
-
 import android.content.ContentResolver;
 import android.graphics.Bitmap;
 import android.net.Uri;
 
+import com.android.camera.Util;
+
 import java.io.IOException;
 import java.io.InputStream;