Unbundle Camera: Unhide ThumbnailUtil and rename it to ThumbnailUtils.

3 files changed, 8 insertions, 8 deletions

diff --git a/src/com/android/camera/ThumbnailController.java b/src/com/android/camera/ThumbnailController.java
index cd76276..44ce7f2 100644
--- a/src/com/android/camera/ThumbnailController.java
+++ b/src/com/android/camera/ThumbnailController.java
@@ -24,7 +24,7 @@ import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
-import android.media.ThumbnailUtil;
+import android.media.ThumbnailUtils;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
@@ -157,9 +157,9 @@ public class ThumbnailController {
                 - mButton.getPaddingLeft() - mButton.getPaddingRight();
         final int miniThumbHeight = param.height
                 - mButton.getPaddingTop() - mButton.getPaddingBottom();
-        mThumb = ThumbnailUtil.extractMiniThumb(
+        mThumb = ThumbnailUtils.extractMiniThumb(
                 original, miniThumbWidth, miniThumbHeight,
-                ThumbnailUtil.NO_RECYCLE_INPUT);
+                ThumbnailUtils.NO_RECYCLE_INPUT);
         Drawable drawable;
         if (mThumbs == null) {
             mThumbs = new Drawable[2];
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index b2c6f5e..ee2164a 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -31,7 +31,7 @@ import android.graphics.drawable.Drawable;
 import android.hardware.Camera.Parameters;
 import android.hardware.Camera.Size;
 import android.media.MediaRecorder;
-import android.media.ThumbnailUtil;
+import android.media.ThumbnailUtils;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -1246,7 +1246,7 @@ public class VideoCamera extends NoSearchActivity
         fadeOut(findViewById(R.id.shutter_button));
         if (mCurrentVideoFilename != null) {
             mVideoFrame.setImageBitmap(
-                    ThumbnailUtil.createVideoThumbnail(mCurrentVideoFilename));
+                    ThumbnailUtils.createVideoThumbnail(mCurrentVideoFilename));
             mVideoFrame.setVisibility(View.VISIBLE);
         }
         int[] pickIds = {R.id.btn_retake, R.id.btn_done, R.id.btn_play};
@@ -1358,7 +1358,7 @@ public class VideoCamera extends NoSearchActivity
     }
 
     private void acquireVideoThumb() {
-        Bitmap videoFrame = ThumbnailUtil.createVideoThumbnail(
+        Bitmap videoFrame = ThumbnailUtils.createVideoThumbnail(
                 mCurrentVideoFilename);
         mThumbController.setData(mCurrentVideoUri, videoFrame);
     }
diff --git a/src/com/android/camera/gallery/VideoObject.java b/src/com/android/camera/gallery/VideoObject.java
index d6aa445..fd759b8 100644
--- a/src/com/android/camera/gallery/VideoObject.java
+++ b/src/com/android/camera/gallery/VideoObject.java
@@ -20,7 +20,7 @@ import com.android.camera.BitmapManager;
 
 import android.content.ContentResolver;
 import android.graphics.Bitmap;
-import android.media.ThumbnailUtil;
+import android.media.ThumbnailUtils;
 import android.net.Uri;
 import android.provider.MediaStore.Images;
 import android.util.Log;
@@ -63,7 +63,7 @@ public class VideoObject extends BaseImage implements IImage {
     @Override
     public Bitmap fullSizeBitmap(int minSideLength, int maxNumberOfPixels,
             boolean rotateAsNeeded, boolean useNative) {
-        return ThumbnailUtil.createVideoThumbnail(mDataPath);
+        return ThumbnailUtils.createVideoThumbnail(mDataPath);
     }
 
     @Override