diff options
author | Angus Kong <shkong@google.com> | 2013-06-03 12:48:16 -0700 |
---|---|---|
committer | Angus Kong <shkong@google.com> | 2013-06-03 14:20:23 -0700 |
commit | 61544549e543aebb69742ceda6e6235bea979630 (patch) | |
tree | 6d406e7b382d7f60d371b2198b3df16fc102a8c7 | |
parent | 4c400b2f79ff7b4b4f11f5b45326316ac7af075c (diff) | |
download | android_packages_apps_Snap-61544549e543aebb69742ceda6e6235bea979630.tar.gz android_packages_apps_Snap-61544549e543aebb69742ceda6e6235bea979630.tar.bz2 android_packages_apps_Snap-61544549e543aebb69742ceda6e6235bea979630.zip |
Add play icon for videos.
Change-Id: Idf73da3c2a8a3beaf45da9f8219ed71c720a5bfd
-rw-r--r-- | src/com/android/camera/data/LocalData.java | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/com/android/camera/data/LocalData.java b/src/com/android/camera/data/LocalData.java index 9f9be8e80..5acdee162 100644 --- a/src/com/android/camera/data/LocalData.java +++ b/src/com/android/camera/data/LocalData.java @@ -21,6 +21,7 @@ import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Matrix; +import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.media.MediaMetadataRetriever; import android.os.AsyncTask; @@ -32,6 +33,7 @@ import android.view.View; import android.widget.ImageView; import com.android.camera.ui.FilmStripView; +import com.android.gallery3d.R; import java.util.Comparator; import java.util.Date; @@ -123,19 +125,23 @@ abstract interface LocalData extends FilmStripView.ImageData { return false; } - @Override - public View getView(Context c, + protected ImageView getImageView(Context c, int decodeWidth, int decodeHeight, Drawable placeHolder) { ImageView v = new ImageView(c); - v.setImageDrawable(placeHolder); + v.setBackground(placeHolder); - v.setScaleType(ImageView.ScaleType.FIT_XY); BitmapLoadTask task = getBitmapLoadTask(v, decodeWidth, decodeHeight); task.execute(); return v; } @Override + public View getView(Context c, + int decodeWidth, int decodeHeight, Drawable placeHolder) { + return getImageView(c, decodeWidth, decodeHeight, placeHolder); + } + + @Override public void prepare() { synchronized (mUsing) { mUsing = true; @@ -179,8 +185,9 @@ abstract interface LocalData extends FilmStripView.ImageData { Log.e(TAG, "Failed decoding bitmap for file:" + path); return; } - mView.setScaleType(ImageView.ScaleType.FIT_XY); - mView.setImageBitmap(bitmap); + BitmapDrawable d = new BitmapDrawable(bitmap); + d.setGravity(android.view.Gravity.FILL); + mView.setBackground(d); } } } @@ -403,6 +410,15 @@ abstract interface LocalData extends FilmStripView.ImageData { } @Override + public View getView(Context c, + int decodeWidth, int decodeHeight, Drawable placeHolder) { + ImageView v = getImageView(c, decodeWidth, decodeHeight, placeHolder); + v.setImageResource(R.drawable.ic_control_play); + v.setScaleType(ImageView.ScaleType.CENTER); + return v; + } + + @Override protected BitmapLoadTask getBitmapLoadTask( ImageView v, int decodeWidth, int decodeHeight) { return new VideoBitmapLoadTask(v); |