resolved conflicts for merge of cdd3e6f to stage-korg-master

Change-Id: I7f5844e0bb9a46cd8948b830712efdbc596a49f7
Jib-BAOSP · Dec 7, 2010 · f68b4b2 · f68b4b2
2 parents 8a778b1 + cdd3e6f
commit f68b4b2
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 9 deletions.
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
@@ -43,13 +43,11 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Debug;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.os.MessageQueue;
-import android.os.SystemClock;
 import android.provider.MediaStore;
 import android.provider.Settings;
 import android.util.AttributeSet;

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
@@ -69,7 +69,6 @@ public class CameraSettings {
     // MMS video length
     public static final int DEFAULT_VIDEO_DURATION_VALUE = -1;
 
-    @SuppressWarnings("unused")
     private static final String TAG = "CameraSettings";
 
     private final Context mContext;
@@ -272,8 +271,6 @@ private static boolean removePreference(PreferenceGroup group, String key) {
     private void filterUnsupportedOptions(PreferenceGroup group,
             ListPreference pref, List<String> supported) {
 
-        CharSequence[] allEntries = pref.getEntries();
-
         // Remove the preference if the parameter is not supported or there is
         // only one options for the settings.
         if (supported == null || supported.size() <= 1) {

diff --git a/src/com/android/camera/Switcher.java b/src/com/android/camera/Switcher.java
@@ -20,7 +20,6 @@
 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;

diff --git a/src/com/android/camera/ThumbnailController.java b/src/com/android/camera/ThumbnailController.java
@@ -46,7 +46,6 @@
  */
 public class ThumbnailController {
 
-    @SuppressWarnings("unused")
     private static final String TAG = "ThumbnailController";
     private final ContentResolver mContentResolver;
     private Uri mUri;

diff --git a/src/com/android/camera/gallery/Image.java b/src/com/android/camera/gallery/Image.java
@@ -23,8 +23,6 @@
  * The class for normal images in gallery.
  */
 public class Image extends BaseImage implements IImage {
-    private static final String TAG = "BaseImage";
-
     private final int mRotation;
 
     public Image(ContentResolver cr,